synchronize with github (tag 2025.1119.0-tachyon)

Update framework

.github/ISSUE_TEMPLATE/config.yml

@@ -1,12 +1,6 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
     - name: Help
-      url: https://github.com/ppy/osu/discussions/categories/q-a
+      url: https://t.me/jvnkosu_chat
-      about: osu! not working or performing as you'd expect? Not sure it's a bug? Check the Q&A section!
+      about: Your jvnkosu! is not working right? Please contact us using our Telegram chat
-    - name: Suggestions or feature request
-      url: https://github.com/ppy/osu/discussions/categories/ideas
-      about: Got something you think should change or be added? Search for or start a new discussion!
-    - name: osu!stable issues
-      url: https://github.com/ppy/osu-stable-issues
-      about: For osu!(stable) - ie. the current "live" game version, check out the dedicated repository. Note that this is for serious bug reports only, not tech support.
 

CONTRIBUTING.md

@@ -73,6 +73,9 @@ Aside from the above, below is a brief checklist of things to watch out when you
 After you're done with your changes and you wish to open the PR, please observe the following recommendations:
 
 - Please submit the pull request from a [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) (not `master`), and keep the *Allow edits from maintainers* check box selected, so that we can push fixes to your PR if necessary.
+- Please pick the following target branch for your pull request:
+    - `pp-dev`, if the change impacts star rating or performance points calculations for any of the rulesets,
+    - `master`, otherwise.
 - Please avoid pushing untested or incomplete code.
 - Please do not force-push or rebase unless we ask you to.
 - Please do not merge `master` continually if there are no conflicts to resolve. We will do this for you when the change is ready for merge.

osu.Android.props

@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.1028.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.1118.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

osu.Desktop/DiscordRichPresence.cs

@@ -29,7 +29,7 @@ namespace osu.Desktop
 {
     internal partial class DiscordRichPresence : Component
     {
-        private const string client_id = "1216669957799018608";
+        private const string client_id = "1440647613358800918";
 
         private DiscordRpcClient client = null!;
 

osu.Desktop/Program.cs

@@ -44,7 +44,7 @@ namespace osu.Desktop
 
                 // While .NET 8 only supports Windows 10 and above, running on Windows 7/8.1 may still work. We are limited by realm currently, as they choose to only support 8.1 and higher.
                 // See https://www.mongodb.com/docs/realm/sdk/dotnet/compatibility/
-                if (windowsVersion.Major < 6 || (windowsVersion.Major == 6 && windowsVersion.Minor <= 2))
+                if (windowsVersion.Major < 6)
                 {
                     unsafe
                     {
@@ -53,13 +53,26 @@ namespace osu.Desktop
                         // We could also better detect compatibility mode if required:
                         // https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
                         SDL3.SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
-                            "Your operating system is too old to run osu!"u8,
+                            "Your operating system is too old to run this game!"u8,
-                            "This version of osu! requires at least Windows 8.1 to run.\n"u8
+                            "This version of the game requires at least Windows 8.1 to run reliably.\n"u8
-                            + "Please upgrade your operating system or consider using an older version of osu!.\n\n"u8
+                            + "You may try to run it on Windows 8 or older, but it's not guaranteed to actually work.\n\n"u8
-                            + "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!"u8, null);
+                            + "Please upgrade your operating system or consider using an older game version.\n\n"u8
+                            + "If you are running a newer version of Windows, please check you don't have \"Compatibility mode\" turned on for the game's executable."u8, null);
                         return;
                     }
                 }
+
+                if (windowsVersion.Major == 6 && windowsVersion.Minor <= 2)
+                {
+                    unsafe
+                    {
+                        SDL3.SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags.SDL_MESSAGEBOX_WARNING,
+                            "Your operating system is too old to run this game!"u8,
+                            "While the version of Windows you're using may be able to launch it, it's likely to work unreliably and crash.\n"u8
+                            + "Please upgrade your operating system or consider using an older game version.\n\n"u8
+                            + "If you are running a newer version of Windows, please check you don't have \"Compatibility mode\" turned on for the game's executable."u8, null);
+                    }
+                }
             }
 
             // NVIDIA profiles are based on the executable name of a process.
@@ -208,9 +221,10 @@ namespace osu.Desktop
         [SupportedOSPlatform("windows")]
         private static void configureWindows(VelopackApp app)
         {
-            app.OnFirstRun(_ => WindowsAssociationManager.InstallAssociations());
+            // we do not want associations here, as that breaks official lazer's associations
-            app.OnAfterUpdateFastCallback(_ => WindowsAssociationManager.UpdateAssociations());
+            // app.OnFirstRun(_ => WindowsAssociationManager.InstallAssociations());
-            app.OnBeforeUninstallFastCallback(_ => WindowsAssociationManager.UninstallAssociations());
+            // app.OnAfterUpdateFastCallback(_ => WindowsAssociationManager.UpdateAssociations());
+            // app.OnBeforeUninstallFastCallback(_ => WindowsAssociationManager.UninstallAssociations());
         }
     }
 }

osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs

@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         [TestCase("mania-samples")]
         [TestCase("mania-slider")] // e.g. second and fourth notes of https://osu.ppy.sh/beatmapsets/73883#mania/216407
         [TestCase("slider-convert-samples")]
+        [TestCase("spinner-convert-samples")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<SampleConvertValue> CreateConvertValue(HitObject hitObject)

osu.Game.Rulesets.Mania.Tests/Resources/SampleLookups/convert-beatmap-custom-sample-bank.osu

@@ -0,0 +1,10 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[TimingPoints]
+0,300,4,0,2,100,1,0
+
+[HitObjects]
+444,320,1000,5,2,0:0:0:0:

osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/spinner-convert-samples-expected-conversion.json

@@ -0,0 +1,16 @@
+{
+  "Mappings": [{
+    "StartTime": 1000.0,
+    "Objects": [{
+      "StartTime": 1000.0,
+      "EndTime": 8000.0,
+      "Column": 0,
+      "PlaySlidingSamples": false,
+      "NodeSamples": [
+        ["Gameplay/soft-hitnormal"],
+        ["Gameplay/soft-hitnormal", "Gameplay/soft-hitfinish"]
+      ],
+      "Samples": ["Gameplay/soft-hitnormal", "Gameplay/soft-hitfinish"],
+    }]
+  }]
+}

osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/spinner-convert-samples.osu

@@ -0,0 +1,18 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:5
+OverallDifficulty:5
+ApproachRate:5
+SliderMultiplier:1.4
+SliderTickRate:1
+
+[TimingPoints]
+0,500,4,2,0,100,1,0
+
+[HitObjects]
+256,192,1000,8,4,8000,0:2:0:0:

osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs

@@ -45,5 +45,19 @@ namespace osu.Game.Rulesets.Mania.Tests
             AssertBeatmapLookup(expected_sample);
             AssertNoLookup(unwanted_sample);
         }
+
+        [Test]
+        public void TestConvertHitObjectCustomSampleBank()
+        {
+            const string beatmap_sample = "normal-hitwhistle2";
+            const string user_skin_sample = "normal-hitnormal";
+
+            SetupSkins(beatmap_sample, user_skin_sample);
+
+            CreateTestWithBeatmap("convert-beatmap-custom-sample-bank.osu");
+
+            AssertBeatmapLookup(beatmap_sample);
+            AssertUserLookup(user_skin_sample);
+        }
     }
 }

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

@@ -85,7 +85,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     Duration = endTime - HitObject.StartTime,
                     Column = column,
                     Samples = HitObject.Samples,
-                    NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
+                    NodeSamples =
+                    [
+                        HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_NORMAL).ToList(),
+                        HitObject.Samples
+                    ]
                 };
             }
             else

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

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             typeof(ManiaModFadeIn)
         }).ToArray();
 
-        public override bool Ranked => false;
+        public override bool Ranked => true;
 
         public override bool ValidForFreestyleAsRequiredMod => false;
 

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

@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModHardRock : ModHardRock, IApplicableToHitObject
     {
         public override double ScoreMultiplier => 1;
-        public override bool Ranked => false;
+        public override bool Ranked => true;
 
         public const double HIT_WINDOW_DIFFICULTY_MULTIPLIER = 1.4;
 

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

@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModMirror : ModMirror, IApplicableToBeatmap
     {
         public override LocalisableString Description => "Notes are flipped horizontally.";
-        public override bool Ranked => UsesDefaultConfiguration;
+        public override bool Ranked => true;
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {

osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs

@@ -64,11 +64,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private readonly Lazy<bool> hasKeyTexture;
 
         private readonly ManiaBeatmap beatmap;
+        private readonly bool isBeatmapConverted;
 
         public ManiaLegacySkinTransformer(ISkin skin, IBeatmap beatmap)
             : base(skin)
         {
             this.beatmap = (ManiaBeatmap)beatmap;
+            isBeatmapConverted = !beatmap.BeatmapInfo.Ruleset.Equals(new ManiaRuleset().RulesetInfo);
 
             isLegacySkin = new Lazy<bool>(() => GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() =>
@@ -196,8 +198,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
         public override ISample GetSample(ISampleInfo sampleInfo)
         {
-            // layered hit sounds never play in mania
+            // layered hit sounds never play in mania-native beatmaps (but do play on converts)
-            if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered)
+            if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered && !isBeatmapConverted)
                 return new SampleVirtual();
 
             return base.GetSample(sampleInfo);

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

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
@@ -10,6 +11,7 @@ using osu.Framework.Input.States;
 using osu.Framework.Logging;
 using osu.Framework.Testing.Input;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -58,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 foreach (var smokeContainer in smokeContainers)
                 {
-                    if (smokeContainer.Children.Count != 0)
+                    if (smokeContainer.Children.OfType<SkinnableDrawable>().Any())
                         return false;
                 }
 

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

@@ -67,6 +67,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             if (LastAcceptedAction != null && nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
                 LastAcceptedAction = null;
+
+            if (LastAcceptedAction != null && gameplayClock.IsRewinding)
+                LastAcceptedAction = null;
         }
 
         protected abstract bool CheckValidNewAction(OsuAction action);

osu.Game.Rulesets.Osu/Mods/OsuModRateAdjustConcrete.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.Audio;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModRateAdjustConcrete : ModRateAdjustConcrete
+    {
+
+    }
+}

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

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => @"Spinners will be automatically completed.";
         public override double ScoreMultiplier => 0.9;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot), typeof(OsuModTargetPractice) };
-        public override bool Ranked => UsesDefaultConfiguration;
+        public override bool Ranked => true;
 
         public void ApplyToDrawableHitObject(DrawableHitObject hitObject)
         {

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

@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     public class OsuModTouchDevice : ModTouchDevice
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot), typeof(OsuModBloom) }).ToArray();
-        public override bool Ranked => UsesDefaultConfiguration;
+        public override bool Ranked => true;
     }
 }

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -230,6 +230,14 @@ namespace osu.Game.Rulesets.Osu
                         new ModScoreV2(),
                     };
 
+                case ModType.Special:
+#if DEBUG
+                    return new Mod[]
+                    {
+                        new OsuModRateAdjustConcrete(),
+                    };
+#endif
+
                 default:
                     return Array.Empty<Mod>();
             }

osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs

@@ -77,9 +77,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             RelativeSizeAxes = Axes.Both;
+        }
 
-            LifetimeStart = smokeStartTime = Time.Current;
+        public void StartDrawing(double time)
-
+        {
+            LifetimeStart = smokeStartTime = time;
+            LifetimeEnd = smokeEndTime = double.MaxValue;
+            SmokePoints.Clear();
+            lastPosition = null;
             totalDistance = pointInterval;
         }
 

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

@@ -1,9 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
+using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
@@ -19,17 +19,24 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public partial class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
     {
+        private DrawablePool<SmokeSkinnableDrawable> segmentPool = null!;
         private SmokeSkinnableDrawable? currentSegmentSkinnable;
 
         private Vector2 lastMousePosition;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(segmentPool = new DrawablePool<SmokeSkinnableDrawable>(10));
+        }
+
         public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
         {
             if (e.Action == OsuAction.Smoke)
             {
-                AddInternal(currentSegmentSkinnable = new SmokeSkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment()));
+                AddInternal(currentSegmentSkinnable = segmentPool.Get(segment => segment.Segment?.StartDrawing(Time.Current)));
 
                 // Add initial position immediately.
                 addPosition();
@@ -59,17 +66,19 @@ namespace osu.Game.Rulesets.Osu.UI
             return base.OnMouseMove(e);
         }
 
-        private void addPosition() => (currentSegmentSkinnable?.Drawable as SmokeSegment)?.AddPosition(lastMousePosition, Time.Current);
+        private void addPosition() => currentSegmentSkinnable?.Segment?.AddPosition(lastMousePosition, Time.Current);
 
         private partial class SmokeSkinnableDrawable : SkinnableDrawable
         {
+            public SmokeSegment? Segment => Drawable as SmokeSegment;
+
             public override bool RemoveWhenNotAlive => true;
 
             public override double LifetimeStart => Drawable.LifetimeStart;
             public override double LifetimeEnd => Drawable.LifetimeEnd;
 
-            public SmokeSkinnableDrawable(ISkinComponentLookup lookup, Func<ISkinComponentLookup, Drawable>? defaultImplementation = null, ConfineMode confineMode = ConfineMode.NoScaling)
+            public SmokeSkinnableDrawable()
-                : base(lookup, defaultImplementation, confineMode)
+                : base(new OsuSkinComponentLookup(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment())
             {
             }
         }

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

@@ -40,6 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private int rollingHits;
 
         private readonly Container tickContainer;
+        private SkinnableDrawable headPiece;
 
         private Color4 colourIdle;
         private Color4 colourEngaged;
@@ -59,7 +60,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.Add(tickContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Depth = float.MinValue
+                Depth = -1,
             });
         }
 
@@ -79,7 +80,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override void RecreatePieces()
         {
+            if (headPiece != null)
+                Content.Remove(headPiece, true);
+
             base.RecreatePieces();
+
+            Content.Add(headPiece = createHeadPiece());
+
             updateColour();
             Height = HitObject.IsStrong ? TaikoStrongableHitObject.DEFAULT_STRONG_SIZE : TaikoHitObject.DEFAULT_SIZE;
         }
@@ -122,6 +129,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.DrumRollBody),
             _ => new ElongatedCirclePiece());
 
+        private SkinnableDrawable createHeadPiece() => new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.DrumRollHead), _ => Empty())
+        {
+            RelativeSizeAxes = Axes.Y,
+            Depth = -2,
+        };
+
         public override bool OnPressed(KeyBindingPressEvent<TaikoAction> e) => false;
 
         private void onNewResult(DrawableHitObject obj, JudgementResult result)
@@ -174,7 +187,23 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private void updateColour(double fadeDuration = 0)
         {
             Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
+
+            if (fadeDuration == 0)
+            {
+                // fade duration is 0 when calling via `RecreatePieces()`.
+                // in this case we want to apply the colour *without* using transforms.
+                // using transforms may result in the application of colour being undone via `DrawableHitObject.UpdateState()` clearing transforms.
+                if (MainPiece.Drawable is IHasAccentColour mainPieceWithAccentColour)
+                    mainPieceWithAccentColour.AccentColour = newColour;
+
+                if (headPiece.Drawable is IHasAccentColour headPieceWithAccentColour)
+                    headPieceWithAccentColour.AccentColour = newColour;
+            }
+            else
+            {
                 (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, fadeDuration);
+                (headPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, fadeDuration);
+            }
         }
 
         public partial class StrongNestedHit : DrawableStrongNestedHit

osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.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;
@@ -21,14 +20,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         {
             get
             {
-                // the reason why this calculation is so involved is that the head & tail sprites have different sizes/radii.
+                var headCentre = (body.ScreenSpaceDrawQuad.TopLeft + body.ScreenSpaceDrawQuad.BottomLeft) / 2;
-                // therefore naively taking the SSDQs of them and making a quad out of them results in a trapezoid shape and not a box.
-                var headCentre = headCircle.ScreenSpaceDrawQuad.Centre;
                 var tailCentre = (tailCircle.ScreenSpaceDrawQuad.TopLeft + tailCircle.ScreenSpaceDrawQuad.BottomLeft) / 2;
 
-                float headRadius = headCircle.ScreenSpaceDrawQuad.Height / 2;
+                float radius = body.ScreenSpaceDrawQuad.Height / 2;
-                float tailRadius = tailCircle.ScreenSpaceDrawQuad.Height / 2;
-                float radius = Math.Max(headRadius, tailRadius);
 
                 var rectangle = new RectangleF(headCentre.X, headCentre.Y, tailCentre.X - headCentre.X, 0).Inflate(radius);
                 return new Quad(rectangle.TopLeft, rectangle.TopRight, rectangle.BottomLeft, rectangle.BottomRight);
@@ -37,8 +32,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => ScreenSpaceDrawQuad.Contains(screenSpacePos);
 
-        private LegacyCirclePiece headCircle = null!;
-
         private Sprite body = null!;
 
         private Sprite tailCircle = null!;
@@ -66,10 +59,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     RelativeSizeAxes = Axes.Both,
                     Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                 },
-                headCircle = new LegacyCirclePiece
-                {
-                    RelativeSizeAxes = Axes.Y,
-                },
             };
 
             AccentColour = colours.YellowDark;
@@ -101,7 +90,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         {
             var colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
 
-            headCircle.AccentColour = colour;
             body.Colour = colour;
             tailCircle.Colour = colour;
         }

osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs

@@ -103,6 +103,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 {
                     switch (taikoComponent.Component)
                     {
+                        case TaikoSkinComponents.DrumRollHead:
+                            if (GetTexture("taiko-roll-middle") != null)
+                                return new LegacyCirclePiece();
+
+                            return null;
+
                         case TaikoSkinComponents.DrumRollBody:
                             if (GetTexture("taiko-roll-middle") != null)
                                 return new LegacyDrumRoll();

osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs

@@ -8,6 +8,7 @@ namespace osu.Game.Rulesets.Taiko
         InputDrum,
         CentreHit,
         RimHit,
+        DrumRollHead,
         DrumRollBody,
         DrumRollTick,
         Swell,

osu.Game.Tests/Chat/TestSceneChannelManager.cs

@@ -42,6 +42,7 @@ namespace osu.Game.Tests.Chat
                 sentMessages = new List<Message>();
                 silencedUserIds = new List<int>();
 
+                ((DummyAPIAccess)API).LocalUserState.Blocks.Clear();
                 ((DummyAPIAccess)API).HandleRequest = req =>
                 {
                     switch (req)
@@ -63,6 +64,10 @@ namespace osu.Game.Tests.Chat
                             silencedUserIds.Clear();
                             return true;
 
+                        case GetMessagesRequest getMessages:
+                            getMessages.TriggerSuccess(sentMessages);
+                            return true;
+
                         case GetUpdatesRequest updatesRequest:
                             updatesRequest.TriggerSuccess(new GetUpdatesResponse
                             {
@@ -161,6 +166,60 @@ namespace osu.Game.Tests.Chat
             AddUntilStep("/help command received", () => channel.Messages.Last().Content.Contains("Supported commands"));
         }
 
+        [Test]
+        public void TestBlockedUserMessagesAreDeletedFromInitialMessageBatch()
+        {
+            Channel channel = null;
+
+            AddStep("create channel", () => channel = createChannel(1, ChannelType.Public));
+            AddStep("post a message from blocked user", () => sentMessages.Add(new Message
+            {
+                ChannelId = channel.Id,
+                Content = "i am blocked",
+                SenderId = 1234
+            }));
+            AddStep("mark user as blocked", () => ((DummyAPIAccess)API).LocalUserState.Blocks.Add(new APIRelation
+            {
+                TargetUser = new APIUser { Username = "blocked", Id = 1234 },
+                TargetID = 1234,
+            }));
+
+            AddStep("join channel and select it", () =>
+            {
+                channelManager.JoinChannel(channel);
+                channelManager.CurrentChannel.Value = channel;
+            });
+            AddAssert("channel has no messages", () => channel.Messages, () => Is.Empty);
+        }
+
+        [Test]
+        public void TestBlockedUserMessagesAreDeletedImmediatelyOnBlock()
+        {
+            Channel channel = null;
+
+            AddStep("create channel", () => channel = createChannel(1, ChannelType.Public));
+
+            AddStep("join channel and select it", () =>
+            {
+                channelManager.JoinChannel(channel);
+                channelManager.CurrentChannel.Value = channel;
+            });
+            AddStep("post a message from blocked user", () => sentMessages.Add(new Message
+            {
+                ChannelId = channel.Id,
+                Content = "i am blocked",
+                SenderId = 1234
+            }));
+            AddUntilStep("channel has message", () => channel.Messages, () => Is.Not.Empty);
+
+            AddStep("block user", () => ((DummyAPIAccess)API).LocalUserState.Blocks.Add(new APIRelation
+            {
+                TargetUser = new APIUser { Username = "blocked", Id = 1234 },
+                TargetID = 1234,
+            }));
+            AddAssert("channel has no messages", () => channel.Messages, () => Is.Empty);
+        }
+
         private void handlePostMessageRequest(PostMessageRequest request)
         {
             var message = new Message(++currentMessageId)

osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs

@@ -126,6 +126,22 @@ namespace osu.Game.Tests.Gameplay
             AssertBeatmapLookup(expected_sample);
         }
 
+        /// <summary>
+        /// Tests that a hitobject which specifies a specific sample file which doesn't exist (or isn't allowed to be looked up)
+        /// falls back to a normal sample.
+        /// </summary>
+        [Test]
+        public void TestFileSampleFallsBackToNormal()
+        {
+            const string expected_sample = "normal-hitnormal";
+
+            SetupSkins(null, expected_sample);
+
+            CreateTestWithBeatmap("file-beatmap-sample.osu");
+
+            AssertUserLookup(expected_sample);
+        }
+
         /// <summary>
         /// Tests that a default hitobject and control point causes <see cref="TestDefaultSampleFromUserSkin"/>.
         /// </summary>

osu.Game.Tests/Online/Matchmaking/MatchmakingRoomStateTest.cs

@@ -29,17 +29,17 @@ namespace osu.Game.Tests.Online.Matchmaking
                 new SoloScoreInfo { UserID = 3, TotalScore = 750 },
             ], placement_points);
 
-            Assert.AreEqual(8, state.Users[1].Points);
+            Assert.AreEqual(8, state.Users.GetOrAdd(1).Points);
-            Assert.AreEqual(1, state.Users[1].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
-            Assert.AreEqual(1, state.Users[1].Rounds[1].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(6, state.Users[2].Points);
+            Assert.AreEqual(6, state.Users.GetOrAdd(2).Points);
-            Assert.AreEqual(3, state.Users[2].Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(2).Placement);
-            Assert.AreEqual(3, state.Users[2].Rounds[1].Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(2).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(7, state.Users[3].Points);
+            Assert.AreEqual(7, state.Users.GetOrAdd(3).Points);
-            Assert.AreEqual(2, state.Users[3].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(3).Placement);
-            Assert.AreEqual(2, state.Users[3].Rounds[1].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(3).Rounds.GetOrAdd(1).Placement);
 
             // 2 -> 1 -> 3
 
@@ -51,17 +51,17 @@ namespace osu.Game.Tests.Online.Matchmaking
                 new SoloScoreInfo { UserID = 3, TotalScore = 500 },
             ], placement_points);
 
-            Assert.AreEqual(15, state.Users[1].Points);
+            Assert.AreEqual(15, state.Users.GetOrAdd(1).Points);
-            Assert.AreEqual(1, state.Users[1].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
-            Assert.AreEqual(2, state.Users[1].Rounds[2].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(1).Rounds.GetOrAdd(2).Placement);
 
-            Assert.AreEqual(14, state.Users[2].Points);
+            Assert.AreEqual(14, state.Users.GetOrAdd(2).Points);
-            Assert.AreEqual(2, state.Users[2].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
-            Assert.AreEqual(1, state.Users[2].Rounds[2].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(2).Rounds.GetOrAdd(2).Placement);
 
-            Assert.AreEqual(13, state.Users[3].Points);
+            Assert.AreEqual(13, state.Users.GetOrAdd(3).Points);
-            Assert.AreEqual(3, state.Users[3].Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).Placement);
-            Assert.AreEqual(3, state.Users[3].Rounds[2].Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).Rounds.GetOrAdd(2).Placement);
         }
 
         [Test]
@@ -80,21 +80,21 @@ namespace osu.Game.Tests.Online.Matchmaking
                 new SoloScoreInfo { UserID = 4, TotalScore = 500 },
             ], placement_points);
 
-            Assert.AreEqual(7, state.Users[1].Points);
+            Assert.AreEqual(7, state.Users.GetOrAdd(1).Points);
-            Assert.AreEqual(1, state.Users[1].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
-            Assert.AreEqual(2, state.Users[1].Rounds[1].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(1).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(7, state.Users[2].Points);
+            Assert.AreEqual(7, state.Users.GetOrAdd(2).Points);
-            Assert.AreEqual(2, state.Users[2].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
-            Assert.AreEqual(2, state.Users[2].Rounds[1].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(5, state.Users[3].Points);
+            Assert.AreEqual(5, state.Users.GetOrAdd(3).Points);
-            Assert.AreEqual(3, state.Users[3].Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).Placement);
-            Assert.AreEqual(4, state.Users[3].Rounds[1].Placement);
+            Assert.AreEqual(4, state.Users.GetOrAdd(3).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(5, state.Users[4].Points);
+            Assert.AreEqual(5, state.Users.GetOrAdd(4).Points);
-            Assert.AreEqual(4, state.Users[4].Placement);
+            Assert.AreEqual(4, state.Users.GetOrAdd(4).Placement);
-            Assert.AreEqual(4, state.Users[4].Rounds[1].Placement);
+            Assert.AreEqual(4, state.Users.GetOrAdd(4).Rounds.GetOrAdd(1).Placement);
         }
 
         [Test]
@@ -120,8 +120,8 @@ namespace osu.Game.Tests.Online.Matchmaking
                 new SoloScoreInfo { UserID = 2, TotalScore = 1000 },
             ], placement_points);
 
-            Assert.AreEqual(1, state.Users[1].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
-            Assert.AreEqual(2, state.Users[2].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
         }
 
         [Test]
@@ -142,12 +142,12 @@ namespace osu.Game.Tests.Online.Matchmaking
                 new SoloScoreInfo { UserID = 5, TotalScore = 1000 },
             ], placement_points);
 
-            Assert.AreEqual(1, state.Users[1].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
-            Assert.AreEqual(2, state.Users[2].Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
-            Assert.AreEqual(3, state.Users[3].Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).Placement);
-            Assert.AreEqual(4, state.Users[4].Placement);
+            Assert.AreEqual(4, state.Users.GetOrAdd(4).Placement);
-            Assert.AreEqual(5, state.Users[5].Placement);
+            Assert.AreEqual(5, state.Users.GetOrAdd(5).Placement);
-            Assert.AreEqual(6, state.Users[6].Placement);
+            Assert.AreEqual(6, state.Users.GetOrAdd(6).Placement);
         }
     }
 }

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

@@ -220,10 +220,13 @@ namespace osu.Game.Tests.Visual.Components
 
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
                 if (registerAsOwner)
-                    dependencies.CacheAs<IPreviewTrackOwner>(this);
+                {
-                return dependencies;
+                    // Automatically handled by interface caching.
+                    return base.CreateChildDependencies(parent);
+                }
+
+                return new DependencyContainer();
             }
         }
 

osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs

@@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Drawable OverlayContent => InternalChild;
 
-            public Drawable FadingContent => (OverlayContent as Container)?.Child;
+            public new Drawable FadingContent => (OverlayContent as Container)?.Child;
         }
     }
 }

osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs

@@ -2,17 +2,20 @@
 // 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;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect;
 using osu.Game.Tests.Visual.OnlinePlay;
 using osuTK;
@@ -21,7 +24,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 {
     public partial class TestSceneBeatmapSelectGrid : OnlinePlayTestScene
     {
-        private MultiplayerPlaylistItem[] items = null!;
+        private MatchmakingPlaylistItem[] items = null!;
 
         private BeatmapSelectGrid grid = null!;
 
@@ -36,24 +39,44 @@ namespace osu.Game.Tests.Visual.Matchmaking
                                          .Take(50)
                                          .ToArray();
 
+            IEnumerable<MatchmakingPlaylistItem> playlistItems;
+
             if (beatmaps.Length > 0)
             {
-                items = Enumerable.Range(1, 50).Select(i => new MultiplayerPlaylistItem
+                playlistItems = Enumerable.Range(1, 50).Select(i =>
+                {
+                    var beatmap = beatmaps[i % beatmaps.Length];
+
+                    return new MatchmakingPlaylistItem(
+                        new MultiplayerPlaylistItem
                         {
                             ID = i,
-                    BeatmapID = beatmaps[i % beatmaps.Length].OnlineID,
+                            BeatmapID = beatmap.OnlineID,
                             StarRating = i / 10.0,
-                }).ToArray();
+                        },
+                        CreateAPIBeatmap(beatmap),
+                        Array.Empty<Mod>()
+                    );
+                });
             }
             else
             {
-                items = Enumerable.Range(1, 50).Select(i => new MultiplayerPlaylistItem
+                playlistItems = Enumerable.Range(1, 50).Select(i => new MatchmakingPlaylistItem(
+                    new MultiplayerPlaylistItem
                     {
                         ID = i,
                         BeatmapID = i,
                         StarRating = i / 10.0,
-                }).ToArray();
+                    },
+                    CreateAPIBeatmap(),
+                    Array.Empty<Mod>()
+                ));
             }
+
+            foreach (var item in playlistItems)
+                item.Beatmap.StarRating = item.PlaylistItem.StarRating;
+
+            items = playlistItems.ToArray();
         }
 
         public override void SetUpSteps()
@@ -70,8 +93,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
             AddStep("add items", () =>
             {
-                foreach (var item in items)
+                grid.AddItems(items);
-                    grid.AddItem(item);
             });
 
             AddWaitStep("wait for panels", 3);
@@ -85,17 +107,17 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 // test scene is weird.
             });
 
-            AddStep("add selection 1", () => grid.ChildrenOfType<BeatmapSelectPanel>().First().AddUser(new APIUser
+            AddStep("add selection 1", () => grid.ChildrenOfType<MatchmakingSelectPanel>().First().AddUser(new APIUser
             {
                 Id = DummyAPIAccess.DUMMY_USER_ID,
                 Username = "Maarvin",
             }));
-            AddStep("add selection 2", () => grid.ChildrenOfType<BeatmapSelectPanel>().Skip(5).First().AddUser(new APIUser
+            AddStep("add selection 2", () => grid.ChildrenOfType<MatchmakingSelectPanel>().Skip(5).First().AddUser(new APIUser
             {
                 Id = 2,
                 Username = "peppy",
             }));
-            AddStep("add selection 3", () => grid.ChildrenOfType<BeatmapSelectPanel>().Skip(10).First().AddUser(new APIUser
+            AddStep("add selection 3", () => grid.ChildrenOfType<MatchmakingSelectPanel>().Skip(10).First().AddUser(new APIUser
             {
                 Id = 1040328,
                 Username = "smoogipoo",
@@ -180,7 +202,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
             AddStep("display roll order", () =>
             {
-                var panels = grid.ChildrenOfType<BeatmapSelectPanel>().ToArray();
+                var panels = grid.ChildrenOfType<MatchmakingSelectPanel>().ToArray();
 
                 for (int i = 0; i < panels.Length; i++)
                 {
@@ -197,6 +219,23 @@ namespace osu.Game.Tests.Visual.Matchmaking
             });
         }
 
+        [Test]
+        public void TestPresentRandomItem()
+        {
+            AddStep("present random item panel", () =>
+            {
+                grid.TransferCandidatePanelsToRollContainer(pickRandomItems(4).candidateItems.Append(-1).ToArray(), duration: 0);
+                grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
+                grid.PlayRollAnimation(-1, duration: 0);
+
+                Scheduler.AddDelayed(() => grid.PresentUnanimouslyChosenBeatmap(-1), 500);
+            });
+
+            AddWaitStep("wait for animation", 5);
+
+            AddStep("reveal beatmap", () => grid.RevealRandomItem(items[RNG.Next(items.Length)].PlaylistItem));
+        }
+
         private (long[] candidateItems, long finalItem) pickRandomItems(int count)
         {
             long[] candidateItems = items.Select(it => it.ID).ToArray();

osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectPanel.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy 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;
@@ -9,6 +10,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect;
 using osu.Game.Tests.Visual.Multiplayer;
 
@@ -19,17 +21,35 @@ namespace osu.Game.Tests.Visual.Matchmaking
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("join room", () =>
+            {
+                var room = CreateDefaultRoom(MatchType.Matchmaking);
+                room.Playlist = Enumerable.Range(1, 50).Select(i => new PlaylistItem(new MultiplayerPlaylistItem
+                {
+                    ID = i,
+                    BeatmapID = 0,
+                    StarRating = i / 10.0,
+                })).ToArray();
+
+                JoinRoom(room);
+            });
+        }
+
         [Test]
         public void TestBeatmapPanel()
         {
-            BeatmapSelectPanel? panel = null;
+            MatchmakingSelectPanel? panel = null;
 
             AddStep("add panel", () =>
             {
                 Child = new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = panel = new BeatmapSelectPanel(new MultiplayerPlaylistItem())
+                    Child = panel = new MatchmakingSelectPanelBeatmap(new MatchmakingPlaylistItem(new MultiplayerPlaylistItem(), CreateAPIBeatmap(), []))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -56,10 +76,54 @@ namespace osu.Game.Tests.Visual.Matchmaking
             AddStep("remove peppy", () => panel!.RemoveUser(new APIUser { Id = 2 }));
             AddStep("remove maarvin", () => panel!.RemoveUser(new APIUser { Id = 6411631 }));
 
-            AddToggleStep("allow selection", value =>
+            AddToggleStep("allow selection", value => panel!.AllowSelection = value);
+        }
+
+        [Test]
+        public void TestRandomPanel()
         {
-                if (panel != null)
+            MatchmakingSelectPanelRandom? panel = null;
-                    panel.AllowSelection = value;
+
+            AddStep("add panel", () =>
+            {
+                Child = new OsuContextMenuContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = panel = new MatchmakingSelectPanelRandom(new MultiplayerPlaylistItem { ID = -1 })
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+            });
+
+            AddToggleStep("allow selection", value => panel!.AllowSelection = value);
+
+            AddStep("reveal beatmap", () => panel!.RevealBeatmap(CreateAPIBeatmap(), []));
+        }
+
+        [Test]
+        public void TestBeatmapWithMods()
+        {
+            AddStep("add panel", () =>
+            {
+                MatchmakingSelectPanel? panel;
+
+                Child = new OsuContextMenuContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = panel = new MatchmakingSelectPanelBeatmap(new MatchmakingPlaylistItem(new MultiplayerPlaylistItem(), CreateAPIBeatmap(), [new OsuModHardRock(), new OsuModDoubleTime()]))
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+
+                panel.AddUser(new APIUser
+                {
+                    Id = 2,
+                    Username = "peppy",
+                });
             });
         }
     }

osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingQueueScreen.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
         {
             base.SetUpSteps();
 
-            AddStep("load screen", () => LoadScreen(new IntroScreen()));
+            AddStep("load screen", () => LoadScreen(new ScreenIntro()));
         }
 
         [Test]

osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingScreen.cs

@@ -124,11 +124,11 @@ namespace osu.Game.Tests.Visual.Matchmaking
 
                 foreach (var user in MultiplayerClient.ServerRoom!.Users.OrderBy(_ => RNG.Next()))
                 {
-                    state.Users[user.UserID].Placement = i++;
+                    state.Users.GetOrAdd(user.UserID).Placement = i++;
-                    state.Users[user.UserID].Points = (8 - i) * 7;
+                    state.Users.GetOrAdd(user.UserID).Points = (8 - i) * 7;
-                    state.Users[user.UserID].Rounds[1].Placement = 1;
+                    state.Users.GetOrAdd(user.UserID).Rounds.GetOrAdd(1).Placement = 1;
-                    state.Users[user.UserID].Rounds[1].TotalScore = 1;
+                    state.Users.GetOrAdd(user.UserID).Rounds.GetOrAdd(1).TotalScore = 1;
-                    state.Users[user.UserID].Rounds[1].Statistics[HitResult.LargeBonus] = 1;
+                    state.Users.GetOrAdd(user.UserID).Rounds.GetOrAdd(1).Statistics[HitResult.LargeBonus] = 1;
                 }
             });
         }

osu.Game.Tests/Visual/Matchmaking/TestScenePlayerPanel.cs

@@ -27,7 +27,13 @@ namespace osu.Game.Tests.Visual.Matchmaking
             AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
             WaitForJoined();
 
-            AddStep("add panel", () => Child = panel = new PlayerPanel(new MultiplayerRoomUser(1)
+            AddStep("join other player to room", () => MultiplayerClient.AddUser(new APIUser
+            {
+                Id = 2,
+                Username = "peppy",
+            }));
+
+            AddStep("add panel", () => Child = panel = new PlayerPanel(new MultiplayerRoomUser(2)
             {
                 User = new APIUser
                 {
@@ -85,9 +91,9 @@ namespace osu.Game.Tests.Visual.Matchmaking
                     UserDictionary =
                     {
                         {
-                            1, new MatchmakingUser
+                            2, new MatchmakingUser
                             {
-                                UserId = 1,
+                                UserId = 2,
                                 Placement = 1,
                                 Points = ++points
                             }
@@ -100,7 +106,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
         [Test]
         public void TestJump()
         {
-            AddStep("jump", () => MultiplayerClient.SendUserMatchRequest(1, new MatchmakingAvatarActionRequest { Action = MatchmakingAvatarAction.Jump }).WaitSafely());
+            AddStep("jump", () => MultiplayerClient.SendUserMatchRequest(2, new MatchmakingAvatarActionRequest { Action = MatchmakingAvatarAction.Jump }).WaitSafely());
         }
 
         [Test]
@@ -108,5 +114,14 @@ namespace osu.Game.Tests.Visual.Matchmaking
         {
             AddToggleStep("toggle quit", quit => panel.HasQuit = quit);
         }
+
+        [Test]
+        public void TestDownloadProgress()
+        {
+            AddStep("set download progress 20%", () => MultiplayerClient.ChangeUserBeatmapAvailability(2, BeatmapAvailability.Downloading(0.2f)));
+            AddStep("set download progress 50%", () => MultiplayerClient.ChangeUserBeatmapAvailability(2, BeatmapAvailability.Downloading(0.5f)));
+            AddStep("set download progress 90%", () => MultiplayerClient.ChangeUserBeatmapAvailability(2, BeatmapAvailability.Downloading(0.9f)));
+            AddStep("set locally available", () => MultiplayerClient.ChangeUserBeatmapAvailability(2, BeatmapAvailability.LocallyAvailable()));
+        }
     }
 }

osu.Game.Tests/Visual/Matchmaking/TestScenePlayerPanelOverlay.cs

@@ -8,7 +8,9 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Matchmaking.Events;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
 using osu.Game.Online.Rooms;
@@ -153,10 +155,69 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 MatchmakingRoomState state = new MatchmakingRoomState();
 
                 for (int i = 0; i < room.Users.Count; i++)
-                    state.Users[room.Users[i].UserID].Placement = placements[i];
+                    state.Users.GetOrAdd(room.Users[i].UserID).Placement = placements[i];
 
                 MultiplayerClient.ChangeMatchRoomState(state).WaitSafely();
             });
         }
+
+        [Test]
+        public void InteractionSpam()
+        {
+            AddStep("join users", () =>
+            {
+                for (int i = 0; i < 7; i++)
+                {
+                    MultiplayerClient.AddUser(new MultiplayerRoomUser(i)
+                    {
+                        User = new APIUser
+                        {
+                            Username = $"User {i}"
+                        }
+                    });
+                }
+            });
+            AddStep("change to grid mode", () => list.DisplayStyle = PanelDisplayStyle.Grid);
+            AddStep("player jump", () => { MultiplayerClient.SendUserMatchRequest(1001, new MatchmakingAvatarActionRequest { Action = MatchmakingAvatarAction.Jump }).WaitSafely(); });
+            AddStep("local jumping", () => jumpSpam(false));
+            AddWaitStep("wait", 25);
+            AddStep("group jumping spam", () => jumpSpam(true));
+            AddWaitStep("wait", 25);
+
+            AddStep("change to split mode", () => list.DisplayStyle = PanelDisplayStyle.Split);
+            AddStep("local jumping", () => jumpSpam(false));
+            AddWaitStep("wait", 25);
+            AddStep("group jumping spam", () => jumpSpam(true));
+            AddWaitStep("wait", 25);
+
+            AddStep("change to hidden mode", () => list.DisplayStyle = PanelDisplayStyle.Hidden);
+            AddStep("local jumping", () => jumpSpam(false));
+            AddWaitStep("wait", 25);
+            AddStep("group jumping spam", () => jumpSpam(true));
+            AddWaitStep("wait", 25);
+        }
+
+        private void jumpSpam(bool everyone)
+        {
+            for (int i = 0; i < 30; i++)
+            {
+                Scheduler.AddDelayed(() =>
+                {
+                    MultiplayerClient.SendUserMatchRequest(1001, new MatchmakingAvatarActionRequest { Action = MatchmakingAvatarAction.Jump }).WaitSafely();
+                }, i * 150 + RNG.NextDouble(0, 140));
+
+                if (!everyone)
+                    continue;
+
+                for (int ii = 0; ii < 7; ii++)
+                {
+                    int iii = ii;
+                    Scheduler.AddDelayed(() =>
+                    {
+                        MultiplayerClient.SendUserMatchRequest(iii, new MatchmakingAvatarActionRequest { Action = MatchmakingAvatarAction.Jump }).WaitSafely();
+                    }, i * 150 + RNG.NextDouble(0, 140));
+                }
+            }
+        }
     }
 }

osu.Game.Tests/Visual/Matchmaking/TestSceneResultsScreen.cs

@@ -36,28 +36,28 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 int localUserId = API.LocalUser.Value.OnlineID;
 
                 // Overall state.
-                state.Users[localUserId].Placement = 1;
+                state.Users.GetOrAdd(localUserId).Placement = 1;
-                state.Users[localUserId].Points = 8;
+                state.Users.GetOrAdd(localUserId).Points = 8;
                 for (int round = 1; round <= state.CurrentRound; round++)
-                    state.Users[localUserId].Rounds[round].Placement = round;
+                    state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(round).Placement = round;
 
                 // Highest score.
-                state.Users[localUserId].Rounds[1].TotalScore = 1000;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(1).TotalScore = 1000;
 
                 // Highest accuracy.
-                state.Users[localUserId].Rounds[2].Accuracy = 0.9995;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(2).Accuracy = 0.9995;
 
                 // Highest combo.
-                state.Users[localUserId].Rounds[3].MaxCombo = 100;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(3).MaxCombo = 100;
 
                 // Most bonus score.
-                state.Users[localUserId].Rounds[4].Statistics[HitResult.LargeBonus] = 50;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(4).Statistics[HitResult.LargeBonus] = 50;
 
                 // Smallest score difference.
-                state.Users[localUserId].Rounds[5].TotalScore = 1000;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(5).TotalScore = 1000;
 
                 // Largest score difference.
-                state.Users[localUserId].Rounds[6].TotalScore = 1000;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(6).TotalScore = 1000;
 
                 MultiplayerClient.ChangeMatchRoomState(state).WaitSafely();
             });
@@ -103,36 +103,78 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 int localUserId = API.LocalUser.Value.OnlineID;
 
                 // Overall state.
-                state.Users[localUserId].Placement = 1;
+                state.Users.GetOrAdd(localUserId).Placement = 1;
-                state.Users[localUserId].Points = 8;
+                state.Users.GetOrAdd(localUserId).Points = 8;
-                state.Users[invalid_user_id].Placement = 2;
+                state.Users.GetOrAdd(invalid_user_id).Placement = 2;
-                state.Users[invalid_user_id].Points = 7;
+                state.Users.GetOrAdd(invalid_user_id).Points = 7;
                 for (int round = 1; round <= state.CurrentRound; round++)
-                    state.Users[localUserId].Rounds[round].Placement = round;
+                    state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(round).Placement = round;
 
                 // Highest score.
-                state.Users[localUserId].Rounds[1].TotalScore = 1000;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(1).TotalScore = 1000;
-                state.Users[invalid_user_id].Rounds[1].TotalScore = 990;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(1).TotalScore = 990;
 
                 // Highest accuracy.
-                state.Users[localUserId].Rounds[2].Accuracy = 0.9995;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(2).Accuracy = 0.9995;
-                state.Users[invalid_user_id].Rounds[2].Accuracy = 0.5;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(2).Accuracy = 0.5;
 
                 // Highest combo.
-                state.Users[localUserId].Rounds[3].MaxCombo = 100;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(3).MaxCombo = 100;
-                state.Users[invalid_user_id].Rounds[3].MaxCombo = 10;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(3).MaxCombo = 10;
 
                 // Most bonus score.
-                state.Users[localUserId].Rounds[4].Statistics[HitResult.LargeBonus] = 50;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(4).Statistics[HitResult.LargeBonus] = 50;
-                state.Users[invalid_user_id].Rounds[4].Statistics[HitResult.LargeBonus] = 25;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(4).Statistics[HitResult.LargeBonus] = 25;
 
                 // Smallest score difference.
-                state.Users[localUserId].Rounds[5].TotalScore = 1000;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(5).TotalScore = 1000;
-                state.Users[invalid_user_id].Rounds[5].TotalScore = 999;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(5).TotalScore = 999;
 
                 // Largest score difference.
-                state.Users[localUserId].Rounds[6].TotalScore = 1000;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(6).TotalScore = 1000;
-                state.Users[invalid_user_id].Rounds[6].TotalScore = 0;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(6).TotalScore = 0;
+
+                MultiplayerClient.ChangeMatchRoomState(state).WaitSafely();
+            });
+        }
+
+        [Test]
+        public void TestNoUsers()
+        {
+            AddStep("show results with no users", () =>
+            {
+                var state = new MatchmakingRoomState
+                {
+                    CurrentRound = 6,
+                    Stage = MatchmakingStage.Ended
+                };
+
+                MultiplayerClient.ChangeMatchRoomState(state).WaitSafely();
+            });
+        }
+
+        [Test]
+        public void TestUserWithNoScore()
+        {
+            AddStep("join another user", () => MultiplayerClient.AddUser(new MultiplayerRoomUser(2)
+            {
+                User = new APIUser
+                {
+                    Id = 2,
+                    Username = "Other user"
+                }
+            }));
+
+            AddStep("show results with no score", () =>
+            {
+                var state = new MatchmakingRoomState
+                {
+                    CurrentRound = 6,
+                    Stage = MatchmakingStage.Ended
+                };
+
+                state.Users.GetOrAdd(API.LocalUser.Value.OnlineID).Rounds.GetOrAdd(1).Placement = 1;
+                state.Users.GetOrAdd(2);
 
                 MultiplayerClient.ChangeMatchRoomState(state).WaitSafely();
             });

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSkipOverlay.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 NUnit.Framework;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public partial class TestSceneMultiplayerSkipOverlay : MultiplayerTestScene
+    {
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
+            WaitForJoined();
+
+            AddStep("add skip overlay", () =>
+            {
+                GameplayClockContainer gameplayClockContainer;
+
+                var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+
+                Child = gameplayClockContainer = new MasterGameplayClockContainer(working, 0)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new MultiplayerSkipOverlay(120000)
+                    },
+                };
+
+                gameplayClockContainer.Start();
+            });
+
+            AddStep("set playing state", () => MultiplayerClient.ChangeUserState(API.LocalUser.Value.OnlineID, MultiplayerUserState.Playing));
+        }
+
+        [Test]
+        public void TestSkip()
+        {
+            for (int i = 0; i < 4; i++)
+            {
+                int i2 = i;
+
+                AddStep($"join user {i2}", () =>
+                {
+                    MultiplayerClient.AddUser(new APIUser
+                    {
+                        Id = i2,
+                        Username = $"User {i2}"
+                    });
+
+                    MultiplayerClient.ChangeUserState(i2, MultiplayerUserState.Playing);
+                });
+            }
+
+            AddStep("local user votes", () => MultiplayerClient.VoteToSkipIntro().WaitSafely());
+
+            for (int i = 0; i < 4; i++)
+            {
+                int i2 = i;
+                AddStep($"user {i2} votes", () => MultiplayerClient.UserVoteToSkipIntro(i2).WaitSafely());
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneGlobalRankDisplay.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.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.Profile.Header.Components;
+using osu.Game.Tests.Visual.UserInterface;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public partial class TestSceneGlobalRankDisplay : ThemeComparisonTestScene
+    {
+        public TestSceneGlobalRankDisplay()
+            : base(false)
+        {
+        }
+
+        protected override Drawable CreateContent() => new FillFlowContainer
+        {
+            RelativeSizeAxes = Axes.Both,
+            Direction = FillDirection.Full,
+            Padding = new MarginPadding(20),
+            Spacing = new Vector2(40),
+            ChildrenEnumerable = new int?[] { 64, 423, 1_453, 3_468, 8_367, 48_342, 78_432, 375_231, 897_783, null }.Select(createDisplay)
+        };
+
+        private GlobalRankDisplay createDisplay(int? rank) => new GlobalRankDisplay
+        {
+            UserStatistics =
+            {
+                Value = new UserStatistics
+                {
+                    GlobalRank = rank,
+                    GlobalRankPercent = rank / 1_000_000f,
+                    Variants =
+                    [
+                        new UserStatistics.Variant
+                        {
+                            VariantType = UserStatistics.RulesetVariant.FourKey,
+                            GlobalRank = rank / 3,
+                        },
+                        new UserStatistics.Variant
+                        {
+                            VariantType = UserStatistics.RulesetVariant.SevenKey,
+                            GlobalRank = 2 * rank / 3,
+                        }
+                    ]
+                },
+            },
+            HighestRank =
+            {
+                Value = rank == null
+                    ? null
+                    : new APIUser.UserRankHighest
+                    {
+                        Rank = rank.Value / 2,
+                        UpdatedAt = DateTimeOffset.Now.AddMonths(-3),
+                    }
+            }
+        };
+    }
+}

osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselArtistGrouping.cs

@@ -4,9 +4,12 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Graphics.Carousel;
 using osu.Game.Screens.Select.Filter;
 using osu.Game.Screens.SelectV2;
+using osu.Game.Tests.Resources;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.SongSelectV2
@@ -322,5 +325,38 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             SelectNextSet();
             AddUntilStep("no beatmap panels visible", () => GetVisiblePanels<PanelBeatmap>().Count(), () => Is.Zero);
         }
+
+        [Test]
+        public void TestGroupChangedAfterEngagingArtistGrouping()
+        {
+            RemoveAllBeatmaps();
+            AddStep("add test beatmaps", () =>
+            {
+                for (int i = 0; i < 5; ++i)
+                {
+                    var baseTestBeatmap = TestResources.CreateTestBeatmapSetInfo(3);
+
+                    var metadata = new BeatmapMetadata
+                    {
+                        Artist = $"{(char)('A' + i)} artist",
+                        Title = $"{(char)('A' + 4 - i)} title",
+                    };
+
+                    foreach (var b in baseTestBeatmap.Beatmaps)
+                        b.Metadata = metadata;
+
+                    Realm.Write(r => r.Add(baseTestBeatmap, update: true));
+                    BeatmapSets.Add(baseTestBeatmap.Detach());
+                }
+
+                SortAndGroupBy(SortMode.Title, GroupMode.Title);
+                SelectNextSet();
+                SelectNextSet();
+                WaitForExpandedGroup(1);
+
+                SortAndGroupBy(SortMode.Artist, GroupMode.Artist);
+                WaitForExpandedGroup(3);
+            });
+        }
     }
 }

osu.Game.Tests/Visual/UserInterface/TestSceneDrawableDate.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.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osuTK;
 using osuTK.Graphics;
@@ -13,7 +16,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public partial class TestSceneDrawableDate : OsuTestScene
     {
-        public TestSceneDrawableDate()
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Create 7 dates", () =>
             {
                 Child = new FillFlowContainer
                 {
@@ -32,6 +38,13 @@ namespace osu.Game.Tests.Visual.UserInterface
                         new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(70))),
                     }
                 };
+            });
+        }
+
+        [Test]
+        public void TestSecondsUpdate()
+        {
+            AddUntilStep("4th date says \"2 seconds ago\"", () => this.ChildrenOfType<DrawableDate>().ElementAt(3).Current.Value == "2 seconds ago");
         }
 
         private partial class PokeyDrawableDate : CompositeDrawable

osu.Game/Audio/IPreviewTrackOwner.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.Allocation;
+
 namespace osu.Game.Audio
 {
     /// <summary>
@@ -10,6 +12,7 @@ namespace osu.Game.Audio
     /// <see cref="IPreviewTrackOwner"/>s can cancel the currently playing <see cref="PreviewTrack"/> through the
     /// global <see cref="PreviewTrackManager"/> if they're the owner of the playing <see cref="PreviewTrack"/>.
     /// </remarks>
+    [Cached]
     public interface IPreviewTrackOwner
     {
     }

osu.Game/Beatmaps/BeatmapInfo.cs

@@ -157,6 +157,12 @@ namespace osu.Game.Beatmaps
 
         public bool Equals(IBeatmapInfo? other) => other is BeatmapInfo b && Equals(b);
 
+        public override int GetHashCode()
+        {
+            // ReSharper disable once NonReadonlyMemberInGetHashCode
+            return ID.GetHashCode();
+        }
+
         public bool AudioEquals(BeatmapInfo? other) => other != null
                                                        && BeatmapSet != null
                                                        && other.BeatmapSet != null

osu.Game/Beatmaps/BeatmapOnlineStatus.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps
         LocallyModified = -4,
 
         [LocalisableDescription(typeof(SongSelectStrings), nameof(SongSelectStrings.StatusUnknown))]
-        [Description("Unknown")]
+        [Description("Offline")]
         None = -3,
 
         [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowStatusGraveyard))]

osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtraInfoRow.cs

@@ -33,7 +33,8 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                         Status = beatmapSet.Status,
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        TextSize = 13f
+                        TextSize = 13f,
+                        ShowUnknownStatus = true
                     },
                     new DifficultySpectrumDisplay
                     {

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -544,7 +544,7 @@ namespace osu.Game.Beatmaps.Formats
             if (!banksOnly)
             {
                 int customSampleBank = toLegacyCustomSampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name)));
-                string sampleFilename = samples.FirstOrDefault(s => string.IsNullOrEmpty(s.Name))?.LookupNames.First() ?? string.Empty;
+                string sampleFilename = samples.FirstOrDefault(s => s is ConvertHitObjectParser.FileHitSampleInfo)?.LookupNames.First() ?? string.Empty;
                 int volume = samples.FirstOrDefault()?.Volume ?? 100;
 
                 // We want to ignore custom sample banks and volume when not encoding to the mania game mode,

osu.Game/Collections/CollectionDropdown.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -263,11 +264,11 @@ namespace osu.Game.Collections
             {
                 Debug.Assert(collection != null);
 
-                collection.PerformWrite(c =>
+                Task.Run(() => collection.PerformWrite(c =>
                 {
                     if (!c.BeatmapMD5Hashes.Remove(beatmap.Value.BeatmapInfo.MD5Hash))
                         c.BeatmapMD5Hashes.Add(beatmap.Value.BeatmapInfo.MD5Hash);
-                });
+                }));
             }
 
             protected override Drawable CreateContent() => (Content)base.CreateContent();

osu.Game/Collections/CollectionToggleMenuItem.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy 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.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
@@ -10,7 +11,7 @@ namespace osu.Game.Collections
     public class CollectionToggleMenuItem : ToggleMenuItem
     {
         public CollectionToggleMenuItem(Live<BeatmapCollection> collection, IBeatmapInfo beatmap)
-            : base(collection.PerformRead(c => c.Name), MenuItemType.Standard, state =>
+            : base(collection.PerformRead(c => c.Name), MenuItemType.Standard, state => Task.Run(() =>
             {
                 collection.PerformWrite(c =>
                 {
@@ -19,7 +20,7 @@ namespace osu.Game.Collections
                     else
                         c.BeatmapMD5Hashes.Remove(beatmap.MD5Hash);
                 });
-            })
+            }))
         {
             State.Value = collection.PerformRead(c => c.BeatmapMD5Hashes.Contains(beatmap.MD5Hash));
         }

osu.Game/Graphics/Carousel/Carousel.cs

@@ -785,32 +785,20 @@ namespace osu.Game.Graphics.Carousel
             // We are performing two important operations here:
             // - Update all Y positions. After a selection occurs, panels may have changed visibility state and therefore Y positions.
             // - Link selected models to CarouselItems. If a selection changed, this is where we find the relevant CarouselItems for further use.
+            FindCarouselItemsForSelection(ref currentKeyboardSelection, ref currentSelection, carouselItems);
+
             for (int i = 0; i < count; i++)
             {
                 var item = carouselItems[i];
-
-                bool isKeyboardSelection = CheckModelEquality(item.Model, currentKeyboardSelection.Model!);
-                bool isSelection = CheckModelEquality(item.Model, currentSelection.Model!);
-
-                // while we don't know the Y position of the item yet, as it's about to be updated,
-                // consumers (specifically `BeatmapCarousel.GetSpacingBetweenPanels()`) benefit from `CurrentSelectionItem` already pointing
-                // at the correct item to avoid redundant local equality checks.
-                // the Y positions will be filled in after they're computed.
-                if (isKeyboardSelection)
-                    currentKeyboardSelection = new Selection(currentKeyboardSelection.Model, item, null, i);
-
-                if (isSelection)
-                    currentSelection = new Selection(currentSelection.Model, item, null, i);
-
                 updateItemYPosition(item, ref lastVisible, ref yPos);
-
-                if (isKeyboardSelection)
-                    currentKeyboardSelection = currentKeyboardSelection with { YPosition = item.CarouselYPosition + item.DrawHeight / 2 };
-
-                if (isSelection)
-                    currentSelection = currentSelection with { YPosition = item.CarouselYPosition + item.DrawHeight / 2 };
             }
 
+            if (currentKeyboardSelection.CarouselItem is CarouselItem currentKeyboardSelectionItem)
+                currentKeyboardSelection = currentKeyboardSelection with { YPosition = currentKeyboardSelectionItem.CarouselYPosition + currentKeyboardSelectionItem.DrawHeight / 2 };
+
+            if (currentSelection.CarouselItem is CarouselItem currentSelectionItem)
+                currentSelection = currentSelection with { YPosition = currentSelectionItem.CarouselYPosition + currentSelectionItem.DrawHeight / 2 };
+
             // Update the total height of all items (to make the scroll container scrollable through the full height even though
             // most items are not displayed / loaded).
             Scroll.SetLayoutHeight(yPos + visibleHalfHeight);
@@ -821,6 +809,27 @@ namespace osu.Game.Graphics.Carousel
                 Scroll.OffsetScrollPosition((float)(currentKeyboardSelection.YPosition!.Value - prevKeyboard.YPosition.Value));
         }
 
+        protected virtual void FindCarouselItemsForSelection(ref Selection keyboardSelection, ref Selection selection, IList<CarouselItem> items)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                var item = items[i];
+
+                bool isKeyboardSelection = CheckModelEquality(item.Model, keyboardSelection.Model!);
+                bool isSelection = CheckModelEquality(item.Model, selection.Model!);
+
+                // while we don't know the Y position of the item yet, as it's about to be updated,
+                // consumers (specifically `BeatmapCarousel.GetSpacingBetweenPanels()`) benefit from `CurrentSelectionItem` already pointing
+                // at the correct item to avoid redundant local equality checks.
+                // the Y positions will be filled in after they're computed.
+                if (isKeyboardSelection)
+                    keyboardSelection = new Selection(keyboardSelection.Model, item, null, i);
+
+                if (isSelection)
+                    selection = new Selection(selection.Model, item, null, i);
+            }
+        }
+
         #endregion
 
         #region Display handling
@@ -1081,7 +1090,7 @@ namespace osu.Game.Graphics.Carousel
         /// <param name="CarouselItem">A related carousel item representation for the model. May be null if selection is not present as an item, or if <see cref="Carousel{T}.refreshAfterSelection"/> has not been run yet.</param>
         /// <param name="YPosition">The Y position of the selection as of the last run of <see cref="Carousel{T}.refreshAfterSelection"/>. May be null if selection is not present as an item, or if <see cref="Carousel{T}.refreshAfterSelection"/> has not been run yet.</param>
         /// <param name="Index">The index of the selection as of the last run of <see cref="Carousel{T}.refreshAfterSelection"/>. May be null if selection is not present as an item, or if <see cref="Carousel{T}.refreshAfterSelection"/> has not been run yet.</param>
-        private record Selection(object? Model = null, CarouselItem? CarouselItem = null, double? YPosition = null, int? Index = null);
+        protected record Selection(object? Model = null, CarouselItem? CarouselItem = null, double? YPosition = null, int? Index = null);
 
         private record DisplayRange(int First, int Last)
         {

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -15,7 +15,6 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers
 {
-    [Cached(typeof(IPreviewTrackOwner))]
     public abstract partial class OsuFocusedOverlayContainer : FocusedOverlayContainer, IPreviewTrackOwner, IKeyBindingHandler<GlobalAction>
     {
         protected readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);

osu.Game/Graphics/DrawableDate.cs

@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Utils;
@@ -80,7 +81,7 @@ namespace osu.Game.Graphics
 
         public DateTimeOffset TooltipContent => Date;
 
-        private class HumanisedDate : IEquatable<HumanisedDate>, ILocalisableStringData
+        private class HumanisedDate : ILocalisableStringData
         {
             public readonly DateTimeOffset Date;
 
@@ -89,11 +90,18 @@ namespace osu.Game.Graphics
                 Date = date;
             }
 
-            public bool Equals(HumanisedDate? other)
+            /// <remarks>
-                => other?.Date != null && Date.Equals(other.Date);
+            /// Humanizer formats the <see cref="Date"/> relative to the local computer time.
-
+            /// Therefore, replacing a <see cref="HumanisedDate"/> instance with another instance of the class with the same <see cref="Date"/>
-            public bool Equals(ILocalisableStringData? other)
+            /// should have the effect of replacing and re-formatting the text.
-                => other is HumanisedDate otherDate && Equals(otherDate);
+            /// Including <see cref="Date"/> in equality members would stop this from happening, as <see cref="SpriteText.Text"/>
+            /// has equality-based early guards to prevent redundant text replaces.
+            /// Thus, instances of these class just compare <see langword="false"/> to any <see cref="ILocalisableStringData"/> to ensure re-formatting happens correctly.
+            /// There are "technically" more "correct" ways to do this (like also including the current time into equality checks),
+            /// but they are simultaneously functionally equivalent to this and overly convoluted.
+            /// This is a private hack-job of a wrapper around humanizer anyway.
+            /// </remarks>
+            public bool Equals(ILocalisableStringData? other) => false;
 
             public string GetLocalised(LocalisationParameters parameters) => HumanizerUtils.Humanize(Date);
 

osu.Game/Graphics/OsuColour.cs

@@ -129,7 +129,7 @@ namespace osu.Game.Graphics
             switch (status)
             {
                 case BeatmapOnlineStatus.None:
-                    return Color4.RosyBrown;
+                    return Color4.AliceBlue;
 
                 case BeatmapOnlineStatus.LocallyModified:
                     return Color4.OrangeRed;
@@ -183,6 +183,9 @@ namespace osu.Game.Graphics
                 case ModType.System:
                     return Yellow;
 
+                case ModType.Special:
+                    return Orange2;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(modType), modType, "Unknown mod type");
             }

osu.Game/Graphics/UserInterface/ProgressBar.cs

@@ -13,6 +13,8 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ProgressBar : SliderBar<double>
     {
+        public bool Seeking { get; private set; }
+
         public Action<double> OnSeek;
 
         private readonly Box fill;
@@ -75,6 +77,16 @@ namespace osu.Game.Graphics.UserInterface
             fill.Width = value * UsableWidth;
         }
 
-        protected override void OnUserChange(double value) => OnSeek?.Invoke(value);
+        protected override void OnUserChange(double value)
+        {
+            Seeking = true;
+        }
+
+        protected override bool Commit()
+        {
+            OnSeek?.Invoke(CurrentNumber.Value);
+            Seeking = false;
+            return base.Commit();
+        }
     }
 }

osu.Game/Graphics/UserInterface/SearchTextBox.cs

@@ -54,7 +54,13 @@ namespace osu.Game.Graphics.UserInterface
                 {
                     case Key.KeypadEnter:
                     case Key.Enter:
-                        return false;
+                        // even if committing per se is not allowed for this textbox,
+                        // the commit flow is also responsible for terminating any active IME.
+                        // ensure that the Enter press terminates IME correctly
+                        // and is also handled if it needs to be, so that it doesn't leak to some other non-focused drawable and cause breakage.
+                        bool wasImeComposing = ImeCompositionActive;
+                        FinalizeImeComposition(true);
+                        return wasImeComposing;
                 }
             }
 

osu.Game/Localisation/AudioSettingsStrings.cs

@@ -99,6 +99,21 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AdjustBeatmapOffsetAutomaticallyTooltip => new TranslatableString(getKey(@"adjust_beatmap_offset_automatically_tooltip"), @"If enabled, the offset suggested from last play on a beatmap is automatically applied.");
 
+        /// <summary>
+        /// "Use experimental audio mode"
+        /// </summary>
+        public static LocalisableString WasapiLabel => new TranslatableString(getKey(@"wasapi_label"), @"Use experimental audio mode");
+
+        /// <summary>
+        /// "This will attempt to initialise the audio engine in a lower latency mode."
+        /// </summary>
+        public static LocalisableString WasapiTooltip => new TranslatableString(getKey(@"wasapi_tooltip"), @"This will attempt to initialise the audio engine in a lower latency mode.");
+
+        /// <summary>
+        /// "Due to reduced latency, your audio offset will need to be adjusted when enabling this setting. Generally expect to subtract 20 - 60 ms from your known value."
+        /// </summary>
+        public static LocalisableString WasapiNotice => new TranslatableString(getKey(@"wasapi_notice"), @"Due to reduced latency, your audio offset will need to be adjusted when enabling this setting. Generally expect to subtract 20 - 60 ms from your known value.");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

osu.Game/Localisation/ButtonSystemStrings.cs

@@ -84,9 +84,12 @@ Please bear with us as we continue to improve the game for you!");
         public static LocalisableString GreetingNotification => new TranslatableString(getKey(@"greeting_notification"), @"Welcome to jvnkosu!");
 
         /// <summary>
-        /// "Failed to load backgrounds!\nCheck your internet connection"
+        /// "Failed to load backgrounds!
+        /// Please check your internet connection"
         /// </summary>
-        public static LocalisableString SeasonalBackgroundsFail => new TranslatableString(getKey(@"seasonal_backgrounds_fail"), @"Failed to load backgrounds!\nCheck your internet connection"); // TODO: implement l10n in osu-resources
+        public static LocalisableString SeasonalBackgroundsFail => new TranslatableString(getKey(@"seasonal_backgrounds_fail"),
+        @"Failed to load backgrounds!
+Please check your internet connection"); // TODO: implement l10n in osu-resources
 
         /// <summary>
         /// "Successfully refreshed background categories!"

osu.Game/Localisation/SettingsStrings.cs

@@ -15,9 +15,9 @@ namespace osu.Game.Localisation
         public static LocalisableString HeaderTitle => new TranslatableString(getKey(@"header_title"), @"settings");
 
         /// <summary>
-        /// "change the way game behaves"
+        /// "change the way your game behaves"
         /// </summary>
-        public static LocalisableString HeaderDescription => new TranslatableString(getKey(@"header_description"), @"change the way game behaves");
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey(@"header_description"), @"change the way your game behaves");
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }

osu.Game/Localisation/SongSelectStrings.cs

@@ -40,9 +40,9 @@ namespace osu.Game.Localisation
         public static LocalisableString LocallyModifiedTooltip => new TranslatableString(getKey(@"locally_modified_tooltip"), @"Has been locally modified");
 
         /// <summary>
-        /// "Unknown"
+        /// "Offline"
         /// </summary>
-        public static LocalisableString StatusUnknown => new TranslatableString(getKey(@"status_unknown"), @"Unknown");
+        public static LocalisableString StatusUnknown => new TranslatableString(getKey(@"status_unknown"), @"Offline");
 
         /// <summary>
         /// "Total Plays"

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

@@ -33,6 +33,7 @@ namespace osu.Game.Online.API.Requests
         Medal,
         Rank,
         RankLost,
+        RankRetracted,
         UserSupportAgain,
         UserSupportFirst,
         UserSupportGift,

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

@@ -44,7 +44,7 @@ namespace osu.Game.Online.API.Requests
         private class VerificationFailureResponse
         {
             [JsonProperty("method")]
-            public SessionVerificationMethod RequiredSessionVerificationMethod { get; set; }
+            public SessionVerificationMethod? RequiredSessionVerificationMethod { get; set; }
         }
     }
 }

osu.Game/Online/Chat/ChannelManager.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -70,6 +71,7 @@ namespace osu.Game.Online.Chat
         private UserLookupCache users { get; set; }
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+        private readonly IBindableList<APIRelation> localUserBlocks = new BindableList<APIRelation>();
         private ScheduledDelegate scheduledAck;
 
         private IChatClient chatClient = null!;
@@ -95,6 +97,9 @@ namespace osu.Game.Online.Chat
 
             apiState.BindTo(api.State);
             apiState.BindValueChanged(_ => SendAck(), true);
+
+            localUserBlocks.BindTo(api.LocalUserState.Blocks);
+            localUserBlocks.BindCollectionChanged((_, args) => Schedule(() => onBlocksChanged(args)));
         }
 
         /// <summary>
@@ -311,8 +316,9 @@ namespace osu.Game.Online.Chat
         private void addMessages(List<Message> messages)
         {
             var channels = JoinedChannels.ToList();
+            var blockedUserIds = localUserBlocks.Select(b => b.TargetID).ToList();
 
-            foreach (var group in messages.GroupBy(m => m.ChannelId))
+            foreach (var group in messages.Where(m => !blockedUserIds.Contains(m.SenderId)).GroupBy(m => m.ChannelId))
                 channels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
 
             lastSilenceMessageId ??= messages.LastOrDefault()?.Id;
@@ -641,6 +647,18 @@ namespace osu.Game.Online.Chat
             api.Queue(req);
         }
 
+        private void onBlocksChanged(NotifyCollectionChangedEventArgs args)
+        {
+            if (args.Action != NotifyCollectionChangedAction.Add)
+                return;
+
+            foreach (APIRelation newBlock in args.NewItems!)
+            {
+                foreach (var channel in joinedChannels)
+                    channel.RemoveMessagesFromUser(newBlock.TargetID);
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

osu.Game/Online/Matchmaking/IMatchmakingClient.cs

@@ -43,11 +43,15 @@ namespace osu.Game.Online.Matchmaking
         /// <summary>
         /// The user has raised a candidate playlist item to be played.
         /// </summary>
+        /// <param name="userId">The notifying user.</param>
+        /// <param name="playlistItemId">The playlist item candidate raised, or -1 as a special value that indicates a random selection.</param>
         Task MatchmakingItemSelected(int userId, long playlistItemId);
 
         /// <summary>
         /// The user has removed a candidate playlist item.
         /// </summary>
+        /// <param name="userId">The notifying user.</param>
+        /// <param name="playlistItemId">The playlist item candidate removed, or -1 as a special value that indicates a random selection.</param>
         Task MatchmakingItemDeselected(int userId, long playlistItemId);
     }
 }

osu.Game/Online/Matchmaking/IMatchmakingServer.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Online.Matchmaking
         /// <summary>
         /// Raise a candidate playlist item to be played in the current round.
         /// </summary>
-        /// <param name="playlistItemId">The playlist item.</param>
+        /// <param name="playlistItemId">The playlist item, or -1 to indicate a random selection.</param>
         Task MatchmakingToggleSelection(long playlistItemId);
 
         /// <summary>

osu.Game/Online/Multiplayer/IMultiplayerClient.cs

@@ -149,5 +149,15 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         /// <param name="item">The changed item.</param>
         Task PlaylistItemChanged(MultiplayerPlaylistItem item);
+
+        /// <summary>
+        /// Signals that a user has requested to skip the beatmap intro.
+        /// </summary>
+        Task UserVotedToSkipIntro(int userId);
+
+        /// <summary>
+        /// Signals that the vote to skip the beatmap intro has passed.
+        /// </summary>
+        Task VoteToSkipIntroPassed();
     }
 }

osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs

@@ -112,6 +112,11 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="playlistItemId">The item to remove.</param>
         Task RemovePlaylistItem(long playlistItemId);
 
+        /// <summary>
+        /// Votes to skip the beatmap intro.
+        /// </summary>
+        Task VoteToSkipIntro();
+
         /// <summary>
         /// Invites a player to the current room.
         /// </summary>

osu.Game/Online/Multiplayer/MatchTypes/Matchmaking/MatchmakingRoomState.cs

@@ -81,10 +81,10 @@ namespace osu.Game.Online.Multiplayer.MatchTypes.Matchmaking
 
                 foreach (var score in scoreGroup)
                 {
-                    MatchmakingUser mmUser = Users[score.UserID];
+                    MatchmakingUser mmUser = Users.GetOrAdd(score.UserID);
                     mmUser.Points += placementPoints[placement - 1];
 
-                    MatchmakingRound mmRound = mmUser.Rounds[CurrentRound];
+                    MatchmakingRound mmRound = mmUser.Rounds.GetOrAdd(CurrentRound);
                     mmRound.Placement = placement;
                     mmRound.TotalScore = score.TotalScore;
                     mmRound.Accuracy = score.Accuracy;

osu.Game/Online/Multiplayer/MatchTypes/Matchmaking/MatchmakingRoundList.cs

@@ -22,25 +22,22 @@ namespace osu.Game.Online.Multiplayer.MatchTypes.Matchmaking
         public IDictionary<int, MatchmakingRound> RoundsDictionary { get; set; } = new Dictionary<int, MatchmakingRound>();
 
         /// <summary>
-        /// Creates or retrieves the score for the given round.
+        /// The total number of rounds.
+        /// </summary>
+        [IgnoreMember]
+        public int Count => RoundsDictionary.Count;
+
+        /// <summary>
+        /// Retrieves or adds a <see cref="MatchmakingRound"/> entry to this list.
         /// </summary>
         /// <param name="round">The round.</param>
-        public MatchmakingRound this[int round]
+        public MatchmakingRound GetOrAdd(int round)
-        {
-            get
         {
             if (RoundsDictionary.TryGetValue(round, out MatchmakingRound? score))
                 return score;
 
             return RoundsDictionary[round] = new MatchmakingRound { Round = round };
         }
-        }
-
-        /// <summary>
-        /// The total number of rounds.
-        /// </summary>
-        [IgnoreMember]
-        public int Count => RoundsDictionary.Count;
 
         public IEnumerator<MatchmakingRound> GetEnumerator() => RoundsDictionary.Values.GetEnumerator();
 

osu.Game/Online/Multiplayer/MatchTypes/Matchmaking/MatchmakingUser.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Online.Multiplayer.MatchTypes.Matchmaking
         /// The aggregate room placement (1-based).
         /// </summary>
         [Key(1)]
-        public int Placement { get; set; }
+        public int? Placement { get; set; }
 
         /// <summary>
         /// The aggregate points.

osu.Game/Online/Multiplayer/MatchTypes/Matchmaking/MatchmakingUserList.cs

@@ -22,25 +22,22 @@ namespace osu.Game.Online.Multiplayer.MatchTypes.Matchmaking
         public IDictionary<int, MatchmakingUser> UserDictionary { get; set; } = new Dictionary<int, MatchmakingUser>();
 
         /// <summary>
-        /// Creates or retrieves the user for the given id.
+        /// The total number of users.
         /// </summary>
-        /// <param name="userId">The user id.</param>
+        [IgnoreMember]
-        public MatchmakingUser this[int userId]
+        public int Count => UserDictionary.Count;
-        {
+
-            get
+        /// <summary>
+        /// Retrieves or adds a <see cref="MatchmakingUser"/> entry to this list.
+        /// </summary>
+        /// <param name="userId">The user ID.</param>
+        public MatchmakingUser GetOrAdd(int userId)
         {
             if (UserDictionary.TryGetValue(userId, out MatchmakingUser? user))
                 return user;
 
             return UserDictionary[userId] = new MatchmakingUser { UserId = userId };
         }
-        }
-
-        /// <summary>
-        /// The total number of users.
-        /// </summary>
-        [IgnoreMember]
-        public int Count => UserDictionary.Count;
 
         public IEnumerator<MatchmakingUser> GetEnumerator() => UserDictionary.Values.GetEnumerator();
 

osu.Game/Online/Multiplayer/MultiplayerClient.cs

@@ -131,6 +131,11 @@ namespace osu.Game.Online.Multiplayer
         public event Action<int, long>? MatchmakingItemDeselected;
         public event Action<MatchRoomState>? MatchRoomStateChanged;
 
+        public event Action<int>? UserVotedToSkipIntro;
+        public event Action? VoteToSkipIntroPassed;
+
+        public event Action<MultiplayerRoomUser, BeatmapAvailability>? BeatmapAvailabilityChanged;
+
         /// <summary>
         /// Whether the <see cref="MultiplayerClient"/> is currently connected.
         /// This is NOT thread safe and usage should be scheduled.
@@ -493,6 +498,8 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task RemovePlaylistItem(long playlistItemId);
 
+        public abstract Task VoteToSkipIntro();
+
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
         {
             handleRoomRequest(() =>
@@ -770,6 +777,7 @@ namespace osu.Game.Online.Multiplayer
 
                 user.BeatmapAvailability = beatmapAvailability;
 
+                BeatmapAvailabilityChanged?.Invoke(user, beatmapAvailability);
                 RoomUpdated?.Invoke();
             });
 
@@ -846,6 +854,10 @@ namespace osu.Game.Online.Multiplayer
             handleRoomRequest(() =>
             {
                 Debug.Assert(Room != null);
+
+                foreach (var user in Room.Users)
+                    user.VotedToSkipIntro = false;
+
                 GameplayStarted?.Invoke();
             });
 
@@ -916,6 +928,37 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
+        Task IMultiplayerClient.UserVotedToSkipIntro(int userId)
+        {
+            handleRoomRequest(() =>
+            {
+                Debug.Assert(Room != null);
+
+                var user = Room.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // TODO: user should NEVER be null here, see https://github.com/ppy/osu/issues/17713.
+                if (user == null)
+                    return;
+
+                user.VotedToSkipIntro = true;
+
+                UserVotedToSkipIntro?.Invoke(userId);
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.VoteToSkipIntroPassed()
+        {
+            handleRoomRequest(() =>
+            {
+                Debug.Assert(Room != null);
+                VoteToSkipIntroPassed?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
         /// <summary>
         /// Populates the <see cref="APIUser"/> for a given collection of <see cref="MultiplayerRoomUser"/>s.
         /// </summary>

osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs

@@ -49,6 +49,12 @@ namespace osu.Game.Online.Multiplayer
         [Key(6)]
         public int? BeatmapId;
 
+        /// <summary>
+        /// Whether this user voted to skip the beatmap intro.
+        /// </summary>
+        [Key(7)]
+        public bool VotedToSkipIntro;
+
         [IgnoreMember]
         public APIUser? User { get; set; }
 

osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs

@@ -70,7 +70,8 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemAdded), ((IMultiplayerClient)this).PlaylistItemAdded);
                     connection.On<long>(nameof(IMultiplayerClient.PlaylistItemRemoved), ((IMultiplayerClient)this).PlaylistItemRemoved);
                     connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemChanged), ((IMultiplayerClient)this).PlaylistItemChanged);
-                    connection.On(nameof(IStatefulUserHubClient.DisconnectRequested), ((IMultiplayerClient)this).DisconnectRequested);
+                    connection.On<int>(nameof(IMultiplayerClient.UserVotedToSkipIntro), ((IMultiplayerClient)this).UserVotedToSkipIntro);
+                    connection.On(nameof(IMultiplayerClient.VoteToSkipIntroPassed), ((IMultiplayerClient)this).VoteToSkipIntroPassed);
 
                     connection.On(nameof(IMatchmakingClient.MatchmakingQueueJoined), ((IMatchmakingClient)this).MatchmakingQueueJoined);
                     connection.On(nameof(IMatchmakingClient.MatchmakingQueueLeft), ((IMatchmakingClient)this).MatchmakingQueueLeft);
@@ -80,6 +81,8 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MatchmakingQueueStatus>(nameof(IMatchmakingClient.MatchmakingQueueStatusChanged), ((IMatchmakingClient)this).MatchmakingQueueStatusChanged);
                     connection.On<int, long>(nameof(IMatchmakingClient.MatchmakingItemSelected), ((IMatchmakingClient)this).MatchmakingItemSelected);
                     connection.On<int, long>(nameof(IMatchmakingClient.MatchmakingItemDeselected), ((IMatchmakingClient)this).MatchmakingItemDeselected);
+
+                    connection.On(nameof(IStatefulUserHubClient.DisconnectRequested), ((IMultiplayerClient)this).DisconnectRequested);
                 };
 
                 IsConnected.BindTo(connector.IsConnected);
@@ -312,6 +315,16 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.RemovePlaylistItem), playlistItemId);
         }
 
+        public override Task VoteToSkipIntro()
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            Debug.Assert(connection != null);
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.VoteToSkipIntro));
+        }
+
         public override Task DisconnectInternal()
         {
             if (connector == null)

osu.Game/Online/PersistentEndpointClientConnector.cs

@@ -150,7 +150,7 @@ namespace osu.Game.Online
             // compare: https://github.com/peppy/osu-stable-reference/blob/013c3010a9d495e3471a9c59518de17006f9ad89/osu!/Online/BanchoClient.cs#L539
             retryDelay = Math.Min(120000, (int)(retryDelay * 1.5));
 
-            Logger.Log($"{ClientName} connect attempt failed: {exception.Message}. Next attempt in {thisDelay / 1000:N0} seconds.", LoggingTarget.Network);
+            Logger.Log($"{ClientName} connect attempt failed. Next attempt in {thisDelay / 1000:N0} seconds.\n{exception}", LoggingTarget.Network);
             await Task.Delay(thisDelay, cancellationToken).ConfigureAwait(false);
         }
 

osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs

@@ -191,7 +191,8 @@ namespace osu.Game.Overlays.BeatmapSet
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
                                         TextSize = 14,
-                                        TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
+                                        TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 },
+                                        ShowUnknownStatus = true
                                     },
                                     storyboardIconPill = new StoryboardIconPill
                                     {

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -329,6 +329,7 @@ namespace osu.Game.Overlays.Mods
             yield return createModColumnContent(ModType.Automation);
             yield return createModColumnContent(ModType.Conversion);
             yield return createModColumnContent(ModType.Fun);
+            yield return createModColumnContent(ModType.Special);
         }
 
         private ColumnDimContainer createModColumnContent(ModType modType)

osu.Game/Overlays/NotificationOverlay.cs

@@ -162,16 +162,17 @@ namespace osu.Game.Overlays
         private int runningDepth;
 
         private readonly Scheduler postScheduler = new Scheduler();
+        private readonly Scheduler criticalPostScheduler = new Scheduler();
 
         public override bool IsPresent =>
             // Delegate presence as we need to consider the toast tray in addition to the main overlay.
-            State.Value == Visibility.Visible || mainContent.IsPresent || toastTray.IsPresent || postScheduler.HasPendingTasks;
+            State.Value == Visibility.Visible || mainContent.IsPresent || toastTray.IsPresent || postScheduler.HasPendingTasks || criticalPostScheduler.HasPendingTasks;
 
         private bool processingPosts = true;
 
         private double? lastSamplePlayback;
 
-        public void Post(Notification notification) => postScheduler.Add(() =>
+        public void Post(Notification notification) => (notification.IsCritical ? criticalPostScheduler : postScheduler).Add(() =>
         {
             ++runningDepth;
 
@@ -220,6 +221,8 @@ namespace osu.Game.Overlays
         {
             base.Update();
 
+            criticalPostScheduler.Update();
+
             if (processingPosts)
                 postScheduler.Update();
         }

osu.Game/Overlays/NotificationOverlayToastTray.cs

@@ -91,8 +91,13 @@ namespace osu.Game.Overlays
         public void FlushAllToasts()
         {
             foreach (var notification in toastFlow.ToArray())
+            {
+                if (notification.IsCritical)
+                    continue;
+
                 forwardNotification(notification);
             }
+        }
 
         public void Post(Notification notification)
         {

osu.Game/Overlays/Notifications/Notification.cs

@@ -39,6 +39,11 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public bool IsImportant { get; init; } = true;
 
+        /// <summary>
+        /// Critical notifications show even during gameplay or other scenarios where notifications would usually be suppressed.
+        /// </summary>
+        public bool IsCritical { get; init; }
+
         /// <summary>
         /// Transient notifications only show as a toast, and do not linger in notification history.
         /// </summary>

osu.Game/Overlays/Notifications/UserAvatarNotification.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty 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.Localisation;
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.Notifications
         protected override void Update()
         {
             base.Update();
-            IconContent.Width = IconContent.DrawHeight;
+            IconContent.Width = Math.Min(78, IconContent.DrawHeight);
         }
     }
 }

osu.Game/Overlays/NowPlayingOverlay.cs

@@ -304,6 +304,8 @@ namespace osu.Game.Overlays
 
             var track = musicController.CurrentTrack;
 
+            if (!progressBar.Seeking)
+            {
                 if (!track.IsDummyDevice)
                 {
                     progressBar.EndTime = track.Length;
@@ -318,6 +320,7 @@ namespace osu.Game.Overlays
                     playButton.Icon = FontAwesome.Regular.PlayCircle;
                 }
             }
+        }
 
         private Action? pendingBeatmapSwitch;
 

osu.Game/Overlays/OverlayScrollContainer.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -14,6 +15,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 osu.Game.Graphics.UserInterface;
@@ -36,6 +38,7 @@ namespace osu.Game.Overlays
         public ScrollBackButton Button { get; private set; }
 
         private readonly Bindable<double?> lastScrollTarget = new Bindable<double?>();
+        private readonly Bindable<double> progress = new Bindable<double>();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -46,7 +49,8 @@ namespace osu.Game.Overlays
                 Origin = Anchor.BottomRight,
                 Margin = new MarginPadding(20),
                 Action = scrollBack,
-                LastScrollTarget = { BindTarget = lastScrollTarget }
+                LastScrollTarget = { BindTarget = lastScrollTarget },
+                Progress = { BindTarget = progress },
             });
         }
 
@@ -54,6 +58,10 @@ namespace osu.Game.Overlays
         {
             base.UpdateAfterChildren();
 
+            // Map current position to standardized progress
+            float height = AvailableContent - DrawHeight;
+            progress.Value = height == 0 ? 1 : Math.Round(Math.Clamp(Current / height, 0, 1), 3);
+
             if (ScrollContent.DrawHeight + button_scroll_position < DrawHeight)
             {
                 Button.State = Visibility.Hidden;
@@ -110,9 +118,11 @@ namespace osu.Game.Overlays
 
             private readonly Container content;
             private readonly Box background;
+            private readonly CircularProgress currentCircularProgress;
             private readonly SpriteIcon spriteIcon;
 
             public Bindable<double?> LastScrollTarget = new Bindable<double?>();
+            public Bindable<double> Progress = new Bindable<double>();
 
             protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
 
@@ -145,6 +155,11 @@ namespace osu.Game.Overlays
                         {
                             RelativeSizeAxes = Axes.Both
                         },
+                        currentCircularProgress = new CircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            InnerRadius = 0.1f,
+                        },
                         spriteIcon = new SpriteIcon
                         {
                             Anchor = Anchor.Centre,
@@ -164,6 +179,7 @@ namespace osu.Game.Overlays
                 IdleColour = colourProvider.Background6;
                 HoverColour = colourProvider.Background5;
                 flashColour = colourProvider.Light1;
+                currentCircularProgress.Colour = colourProvider.Highlight1;
 
                 scrollToTopSample = audio.Samples.Get(@"UI/scroll-to-top");
                 scrollToPreviousSample = audio.Samples.Get(@"UI/scroll-to-previous");
@@ -173,6 +189,8 @@ namespace osu.Game.Overlays
             {
                 base.LoadComplete();
 
+                Progress.BindValueChanged(p => currentCircularProgress.Progress = p.NewValue, true);
+
                 LastScrollTarget.BindValueChanged(target =>
                 {
                     spriteIcon.ScaleTo(target.NewValue != null ? new Vector2(1f, -1f) : Vector2.One, fade_duration, Easing.OutQuint);

osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs

@@ -78,12 +78,13 @@ namespace osu.Game.Overlays.Profile.Header
 
         private void updateDisplay(APIUser? user)
         {
+            var cutoffDate = new DateTime(2025, 8, 25);
             topLinkContainer.Clear();
             bottomLinkContainer.Clear();
 
             if (user == null) return;
 
-            if (user.JoinDate.ToUniversalTime().Year < 2008)
+            if (user.JoinDate.ToUniversalTime().Date < cutoffDate)
                 topLinkContainer.AddText(UsersStrings.ShowFirstMembers);
             else
             {

osu.Game/Overlays/Profile/Header/Components/GlobalRankDisplay.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public partial class GlobalRankDisplay : CompositeDrawable
+    {
+        public Bindable<UserStatistics?> UserStatistics = new Bindable<UserStatistics?>();
+        public Bindable<APIUser.UserRankHighest?> HighestRank = new Bindable<APIUser.UserRankHighest?>();
+
+        private ProfileValueDisplay info = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        public GlobalRankDisplay()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = info = new ProfileValueDisplay(big: true)
+            {
+                Title = UsersStrings.ShowRankGlobalSimple
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            UserStatistics.BindValueChanged(_ => updateState());
+            HighestRank.BindValueChanged(_ => updateState(), true);
+        }
+
+        private void updateState()
+        {
+            info.Content.Text = UserStatistics.Value?.GlobalRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
+            info.Content.TooltipText = getGlobalRankTooltipText();
+
+            var tier = getRankingTier();
+            info.Content.Colour = tier == null ? colourProvider.Content2 : OsuColour.ForRankingTier(tier.Value);
+            info.Content.Font = info.Content.Font.With(weight: tier == null || tier == RankingTier.Iron ? FontWeight.Regular : FontWeight.Bold);
+        }
+
+        /// <seealso href="https://github.com/ppy/osu-web/blob/6fcd85eb006ce7699d6f747597435c01344b2d2d/resources/js/profile-page/rank.tsx#L19-L46"/>
+        private RankingTier? getRankingTier()
+        {
+            var stats = UserStatistics.Value;
+
+            int? rank = stats?.GlobalRank;
+            float? percent = stats?.GlobalRankPercent;
+
+            if (rank == null || percent == null)
+                return null;
+
+            if (rank <= 100)
+                return RankingTier.Lustrous;
+
+            if (percent < 0.0005)
+                return RankingTier.Radiant;
+
+            if (percent < 0.0015)
+                return RankingTier.Rhodium;
+
+            if (percent < 0.005)
+                return RankingTier.Platinum;
+
+            if (percent < 0.015)
+                return RankingTier.Gold;
+
+            if (percent < 0.05)
+                return RankingTier.Silver;
+
+            if (percent < 0.15)
+                return RankingTier.Bronze;
+
+            if (percent < 0.5)
+                return RankingTier.Iron;
+
+            return null;
+        }
+
+        private LocalisableString getGlobalRankTooltipText()
+        {
+            var rankHighest = HighestRank.Value;
+            var variants = UserStatistics.Value?.Variants;
+
+            LocalisableString? result = null;
+
+            if (variants?.Count > 0)
+            {
+                foreach (var variant in variants)
+                {
+                    if (variant.GlobalRank != null)
+                    {
+                        var variantText = LocalisableString.Interpolate($"{variant.VariantType.GetLocalisableDescription()}: {variant.GlobalRank.ToLocalisableString("\\##,##0")}");
+
+                        if (result == null)
+                            result = variantText;
+                        else
+                            result = LocalisableString.Interpolate($"{result}\n{variantText}");
+                    }
+                }
+            }
+
+            if (rankHighest != null)
+            {
+                var rankHighestText = UsersStrings.ShowRankHighest(
+                    rankHighest.Rank.ToLocalisableString("\\##,##0"),
+                    rankHighest.UpdatedAt.ToLocalisableString(@"d MMM yyyy"));
+
+                if (result == null)
+                    result = rankHighestText;
+                else
+                    result = LocalisableString.Interpolate($"{result}\n{rankHighestText}");
+            }
+
+            return result ?? default;
+        }
+    }
+}

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

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private readonly Dictionary<ScoreRank, ScoreRankInfo> scoreRankInfos = new Dictionary<ScoreRank, ScoreRankInfo>();
         private ProfileValueDisplay medalInfo = null!;
         private ProfileValueDisplay ppInfo = null!;
-        private ProfileValueDisplay detailGlobalRank = null!;
+        private GlobalRankDisplay detailGlobalRank = null!;
         private ProfileValueDisplay detailCountryRank = null!;
         private RankGraph rankGraph = null!;
 
@@ -64,10 +64,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                         {
                             new[]
                             {
-                                detailGlobalRank = new ProfileValueDisplay(true)
+                                detailGlobalRank = new GlobalRankDisplay(),
-                                {
-                                    Title = UsersStrings.ShowRankGlobalSimple,
-                                },
                                 Empty(),
                                 detailCountryRank = new ProfileValueDisplay(true)
                                 {
@@ -156,59 +153,22 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             var user = data?.User;
 
-            medalInfo.Content = user?.Achievements?.Length.ToString() ?? "0";
+            medalInfo.Content.Text = user?.Achievements?.Length.ToString() ?? "0";
-            ppInfo.Content = user?.Statistics?.PP?.ToLocalisableString("#,##0") ?? (LocalisableString)"0";
+            ppInfo.Content.Text = user?.Statistics?.PP?.ToLocalisableString("#,##0") ?? (LocalisableString)"0";
+            ppInfo.Content.TooltipText = getPPInfoTooltipText(user);
 
             foreach (var scoreRankInfo in scoreRankInfos)
                 scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
 
-            detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
+            detailGlobalRank.HighestRank.Value = user?.RankHighest;
-            detailGlobalRank.ContentTooltipText = getGlobalRankTooltipText(user);
+            detailGlobalRank.UserStatistics.Value = user?.Statistics;
 
-            detailCountryRank.Content = user?.Statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
+            detailCountryRank.Content.Text = user?.Statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
-            detailCountryRank.ContentTooltipText = getCountryRankTooltipText(user);
+            detailCountryRank.Content.TooltipText = getCountryRankTooltipText(user);
 
             rankGraph.Statistics.Value = user?.Statistics;
         }
 
-        private static LocalisableString getGlobalRankTooltipText(APIUser? user)
-        {
-            var rankHighest = user?.RankHighest;
-            var variants = user?.Statistics?.Variants;
-
-            LocalisableString? result = null;
-
-            if (variants?.Count > 0)
-            {
-                foreach (var variant in variants)
-                {
-                    if (variant.GlobalRank != null)
-                    {
-                        var variantText = LocalisableString.Interpolate($"{variant.VariantType.GetLocalisableDescription()}: {variant.GlobalRank.ToLocalisableString("\\##,##0")}");
-
-                        if (result == null)
-                            result = variantText;
-                        else
-                            result = LocalisableString.Interpolate($"{result}\n{variantText}");
-                    }
-                }
-            }
-
-            if (rankHighest != null)
-            {
-                var rankHighestText = UsersStrings.ShowRankHighest(
-                    rankHighest.Rank.ToLocalisableString("\\##,##0"),
-                    rankHighest.UpdatedAt.ToLocalisableString(@"d MMM yyyy"));
-
-                if (result == null)
-                    result = rankHighestText;
-                else
-                    result = LocalisableString.Interpolate($"{result}\n{rankHighestText}");
-            }
-
-            return result ?? default;
-        }
-
         private static LocalisableString getCountryRankTooltipText(APIUser? user)
         {
             var variants = user?.Statistics?.Variants;
@@ -234,6 +194,28 @@ namespace osu.Game.Overlays.Profile.Header.Components
             return result ?? default;
         }
 
+        private static LocalisableString getPPInfoTooltipText(APIUser? user)
+        {
+            var variants = user?.Statistics?.Variants;
+
+            LocalisableString? result = null;
+
+            if (variants?.Count > 0)
+            {
+                foreach (var variant in variants)
+                {
+                    var variantText = LocalisableString.Interpolate($"{variant.VariantType.GetLocalisableDescription()}: {variant.PP.ToLocalisableString("#,##0")}");
+
+                    if (result == null)
+                        result = variantText;
+                    else
+                        result = LocalisableString.Interpolate($"{result}\n{variantText}");
+                }
+            }
+
+            return result ?? default;
+        }
+
         private partial class ScoreRankInfo : CompositeDrawable
         {
             private readonly OsuSpriteText rankCount;

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

@@ -14,22 +14,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
     public partial class ProfileValueDisplay : CompositeDrawable
     {
         private readonly OsuSpriteText title;
-        private readonly ContentText content;
 
         public LocalisableString Title
         {
             set => title.Text = value;
         }
 
-        public LocalisableString Content
+        public ContentText Content { get; }
-        {
-            set => content.Text = value;
-        }
-
-        public LocalisableString ContentTooltipText
-        {
-            set => content.TooltipText = value;
-        }
 
         public ProfileValueDisplay(bool big = false, int minimumWidth = 60)
         {
@@ -44,9 +35,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Font = OsuFont.GetFont(size: 12)
                     },
-                    content = new ContentText
+                    Content = new ContentText
                     {
-                        Font = OsuFont.GetFont(size: big ? 30 : 20, weight: FontWeight.Light),
+                        Font = OsuFont.GetFont(size: big ? 30 : 20, weight: big ? FontWeight.Regular : FontWeight.Light),
                     },
                     new Container // Add a minimum size to the FillFlowContainer
                     {
@@ -60,10 +51,10 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private void load(OverlayColourProvider colourProvider)
         {
             title.Colour = colourProvider.Content1;
-            content.Colour = colourProvider.Content2;
+            Content.Colour = colourProvider.Content2;
         }
 
-        private partial class ContentText : OsuSpriteText, IHasTooltip
+        public partial class ContentText : OsuSpriteText, IHasTooltip
         {
             public LocalisableString TooltipText { get; set; }
         }

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

@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             InternalChild = info = new ProfileValueDisplay(minimumWidth: 140)
             {
                 Title = UsersStrings.ShowStatsPlayTime,
-                ContentTooltipText = "0 hours",
+                Content = { TooltipText = "0 hours", }
             };
 
             User.BindValueChanged(updateTime, true);
@@ -35,8 +35,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private void updateTime(ValueChangedEvent<UserProfileData?> user)
         {
             int? playTime = user.NewValue?.User.Statistics?.PlayTime;
-            info.ContentTooltipText = (playTime ?? 0) / 3600 + " hours";
+            info.Content.TooltipText = (playTime ?? 0) / 3600 + " hours";
-            info.Content = formatTime(playTime);
+            info.Content.Text = formatTime(playTime);
         }
 
         private string formatTime(int? secondsNull)

osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs

@@ -189,6 +189,13 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     addText($" ({getRulesetName()})");
                     break;
 
+                case RecentActivityType.RankRetracted:
+                    addUserLink();
+                    addText("'s score on ");
+                    addBeatmapLink();
+                    addText($" has been retracted ({getRulesetName()})");
+                    break;
+
                 case RecentActivityType.UserSupportAgain:
                     addUserLink();
                     addText(" has once again chosen to support osu! - thanks for your generosity!");

osu.Game/Overlays/Profile/Sections/Recent/RecentActivityIcon.cs

@@ -75,6 +75,11 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     icon.Colour = Color4.White;
                     break;
 
+                case RecentActivityType.RankRetracted:
+                    icon.Icon = FontAwesome.Solid.Ban;
+                    icon.Colour = colours.Red1;
+                    break;
+
                 case RecentActivityType.UserSupportAgain:
                     icon.Icon = FontAwesome.Solid.Heart;
                     icon.Colour = colours.Pink;

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

@@ -41,8 +41,8 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
             {
                 Add(wasapiExperimental = new SettingsCheckbox
                 {
-                    LabelText = "Use experimental audio mode",
+                    LabelText = AudioSettingsStrings.WasapiLabel,
-                    TooltipText = "This will attempt to initialise the audio engine in a lower latency mode.",
+                    TooltipText = AudioSettingsStrings.WasapiTooltip,
                     Current = audio.UseExperimentalWasapi,
                     Keywords = new[] { "wasapi", "latency", "exclusive" }
                 });
@@ -64,10 +64,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
             if (wasapiExperimental != null)
             {
                 if (wasapiExperimental.Current.Value)
-                {
+                    wasapiExperimental.SetNoticeText(AudioSettingsStrings.WasapiNotice, true);
-                    wasapiExperimental.SetNoticeText(
-                        "Due to reduced latency, your audio offset will need to be adjusted when enabling this setting. Generally expect to subtract 20 - 60 ms from your known value.", true);
-                }
                 else
                     wasapiExperimental.ClearNoticeText();
             }

osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs

@@ -91,6 +91,7 @@ namespace osu.Game.Overlays.SkinEditor
         private void load(OsuConfigManager config)
         {
             config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+            config.BindWith(OsuSetting.HUDVisibilityMode, configVisibilityMode);
         }
 
         protected override void LoadComplete()
@@ -117,7 +118,7 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected override void PopIn()
         {
-            globallyDisableBeatmapSkinSetting();
+            overrideSkinEditorRelevantSettings();
 
             if (skinEditor != null)
             {
@@ -159,7 +160,7 @@ namespace osu.Game.Overlays.SkinEditor
             nestedInputManagerDisable?.Dispose();
             nestedInputManagerDisable = null;
 
-            globallyReenableBeatmapSkinSetting();
+            restoreSkinEditorRelevantSettings();
         }
 
         public void PresentGameplay() => presentGameplay(false);
@@ -330,11 +331,13 @@ namespace osu.Game.Overlays.SkinEditor
         private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
         private LeasedBindable<bool>? leasedBeatmapSkins;
 
-        private void globallyDisableBeatmapSkinSetting()
+        private readonly Bindable<HUDVisibilityMode> configVisibilityMode = new Bindable<HUDVisibilityMode>();
-        {
+        private LeasedBindable<HUDVisibilityMode>? leasedVisibilityMode;
-            if (beatmapSkins.Disabled)
-                return;
 
+        private void overrideSkinEditorRelevantSettings()
+        {
+            if (!beatmapSkins.Disabled)
+            {
                 // The skin editor doesn't work well if beatmap skins are being applied to the player screen.
                 // To keep things simple, disable the setting game-wide while using the skin editor.
                 //
@@ -344,10 +347,17 @@ namespace osu.Game.Overlays.SkinEditor
                 leasedBeatmapSkins.Value = false;
             }
 
-        private void globallyReenableBeatmapSkinSetting()
+            leasedVisibilityMode = configVisibilityMode.BeginLease(true);
+            leasedVisibilityMode.Value = HUDVisibilityMode.Always;
+        }
+
+        private void restoreSkinEditorRelevantSettings()
         {
             leasedBeatmapSkins?.Return();
             leasedBeatmapSkins = null;
+
+            leasedVisibilityMode?.Return();
+            leasedVisibilityMode = null;
         }
 
         public new void ToggleVisibility()

osu.Game/Overlays/Wiki/WikiHeader.cs

@@ -5,13 +5,20 @@
 
 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.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Localisation;
+using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
+using osuTK;
 
 namespace osu.Game.Overlays.Wiki
 {
@@ -19,11 +26,15 @@ namespace osu.Game.Overlays.Wiki
     {
         public static LocalisableString IndexPageString => LayoutStrings.HeaderHelpIndex;
 
+        private const string github_wiki_base = @"https://github.com/ppy/osu-wiki/blob/master/wiki";
+
         public readonly Bindable<APIWikiPage> WikiPageData = new Bindable<APIWikiPage>();
 
         public Action ShowIndexPage;
         public Action ShowParentPage;
 
+        private readonly Bindable<string> githubPath = new Bindable<string>();
+
         public WikiHeader()
         {
             TabControl.AddItem(IndexPageString);
@@ -35,6 +46,9 @@ namespace osu.Game.Overlays.Wiki
 
         private void onWikiPageChange(ValueChangedEvent<APIWikiPage> e)
         {
+            // Clear the path beforehand in case we got an error page.
+            githubPath.Value = null;
+
             if (e.NewValue == null)
                 return;
 
@@ -42,6 +56,7 @@ namespace osu.Game.Overlays.Wiki
             Current.Value = null;
 
             TabControl.AddItem(IndexPageString);
+            githubPath.Value = $"{github_wiki_base}/{e.NewValue.Path}/{e.NewValue.Locale}.md";
 
             if (e.NewValue.Path == WikiOverlay.INDEX_PATH)
             {
@@ -56,6 +71,27 @@ namespace osu.Game.Overlays.Wiki
             Current.Value = e.NewValue.Title;
         }
 
+        protected override Drawable CreateTabControlContent()
+        {
+            return new FillFlowContainer
+            {
+                Height = 40,
+                AutoSizeAxes = Axes.X,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    new ShowOnGitHubButton
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Size = new Vector2(32),
+                        TargetPath = { BindTarget = githubPath },
+                    },
+                },
+            };
+        }
+
         private void onCurrentChange(ValueChangedEvent<LocalisableString?> e)
         {
             if (e.NewValue == TabControl.Items.LastOrDefault())
@@ -83,5 +119,39 @@ namespace osu.Game.Overlays.Wiki
                 Icon = OsuIcon.Wiki;
             }
         }
+
+        private partial class ShowOnGitHubButton : RoundedButton
+        {
+            public override LocalisableString TooltipText => WikiStrings.ShowEditLink;
+
+            public readonly Bindable<string> TargetPath = new Bindable<string>();
+
+            [BackgroundDependencyLoader(true)]
+            private void load([CanBeNull] ILinkHandler linkHandler)
+            {
+                Width = 42;
+
+                Add(new SpriteIcon
+                {
+                    Size = new Vector2(12),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Icon = FontAwesome.Brands.Github,
+                });
+
+                Action = () => linkHandler?.HandleLink(TargetPath.Value);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                TargetPath.BindValueChanged(e =>
+                {
+                    this.FadeTo(e.NewValue != null ? 1 : 0);
+                    Enabled.Value = e.NewValue != null;
+                }, true);
+            }
+        }
     }
 }

osu.Game/Rulesets/Mods/IApplicableFailExit.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.Rulesets.Mods
+{
+    /// <summary>
+    /// Represents a mod which can override a fail and quit the game instead.
+    /// </summary>
+    public interface IApplicableFailExit : IApplicableMod
+    {
+        /// <summary>
+        /// Whether we should allow failing at the current point in time.
+        /// </summary>
+        /// <returns>Whether the fail should be allowed to proceed. Return false to block.</returns>
+        bool PerformFail();
+
+        /// <summary>
+        /// Whether we want to exit the game on fail. Only used if <see cref="PerformFail"/> returns true.
+        /// </summary>
+        bool ExitOnFail { get; }
+    }
+}

osu.Game/Rulesets/Mods/IApplicableToOsuGameBase.cs

@@ -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;
-
-namespace osu.Game.Rulesets.Mods
-{
-    /// <summary>
-    /// An interface for mods that apply changes to the <see cref="OsuGameBase"/>.
-    /// This is really stupid and f%%king dangerous, possibly disasterous even.
-    /// </summary>
-    public interface IApplicableToOsuGameBase : IApplicableMod
-    {
-        /// <summary>
-        /// Provide a <see cref="OsuGameBase"/>. Called once on initialisation of a play instance.
-        /// </summary>
-        void ApplyToOsuGameBase(OsuGameBase game);
-    }
-}

osu.Game/Rulesets/Mods/Mod.cs

@@ -127,7 +127,9 @@ namespace osu.Game.Rulesets.Mods
         /// The settings are returned in ascending key order as per <see cref="SettingsMap"/>.
         /// The ordering is intentionally enforced manually, as ordering of <see cref="Dictionary{TKey,TValue}.Values"/> is unspecified.
         /// </remarks>
-        internal IEnumerable<IBindable> SettingsBindables => SettingsMap.OrderBy(pair => pair.Key).Select(pair => pair.Value);
+        internal IEnumerable<IBindable> SettingsBindables => SettingsMap.OrderBy(pair => pair.Key)
+                                                                .Select(pair => pair.Value)
+                                                                .Where(x => !x.GetType().GetCustomAttributes(typeof(JsonIgnoreAttribute)).Any());
 
         /// <summary>
         /// Provides mapping of names to <see cref="IBindable"/>s of all settings within this mod.

osu.Game/Rulesets/Mods/ModClassic.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         ///  - Hit windows differ (https://github.com/ppy/osu/issues/11311).
         ///  - Sliders always gives combo for slider end, even on miss (https://github.com/ppy/osu/issues/11769).
         /// </summary>
-        public sealed override bool Ranked => false;
+        public sealed override bool Ranked => true;
 
         public sealed override bool ValidForFreestyleAsRequiredMod => false;
     }

osu.Game/Rulesets/Mods/ModDaycore.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => OsuIcon.ModDaycore;
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "Whoaaaaa...";
-        public override bool Ranked => UsesDefaultConfiguration;
+        public override bool Ranked => true;
 
         [SettingSource("Speed decrease", "The actual decrease to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)

osu.Game/Rulesets/Mods/ModDoubleTime.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => OsuIcon.ModDoubleTime;
         public override ModType Type => ModType.DifficultyIncrease;
         public override LocalisableString Description => "Zoooooooooom...";
-        public override bool Ranked => SpeedChange.IsDefault;
+        public override bool Ranked => true;
 
         [SettingSource("Speed increase", "The actual increase to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)

osu.Game/Rulesets/Mods/ModEasy.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override double ScoreMultiplier => 0.5;
         public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
-        public override bool Ranked => UsesDefaultConfiguration;
+        public override bool Ranked => true;
         public override bool ValidForFreestyleAsRequiredMod => true;
 
         protected const float ADJUST_RATIO = 0.5f;