synchronize with github (tag 2025.1105.0)

Implement vote-to-skip in multiplayer

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(1, state.Users[1].Placement);
-            Assert.AreEqual(1, state.Users[1].Rounds[1].Placement);
+            Assert.AreEqual(8, state.Users.GetOrAdd(1).Points);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(6, state.Users[2].Points);
-            Assert.AreEqual(3, state.Users[2].Placement);
-            Assert.AreEqual(3, state.Users[2].Rounds[1].Placement);
+            Assert.AreEqual(6, state.Users.GetOrAdd(2).Points);
+            Assert.AreEqual(3, state.Users.GetOrAdd(2).Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(2).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(7, state.Users[3].Points);
-            Assert.AreEqual(2, state.Users[3].Placement);
-            Assert.AreEqual(2, state.Users[3].Rounds[1].Placement);
+            Assert.AreEqual(7, state.Users.GetOrAdd(3).Points);
+            Assert.AreEqual(2, state.Users.GetOrAdd(3).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(1, state.Users[1].Placement);
-            Assert.AreEqual(2, state.Users[1].Rounds[2].Placement);
+            Assert.AreEqual(15, state.Users.GetOrAdd(1).Points);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(1).Rounds.GetOrAdd(2).Placement);
 
-            Assert.AreEqual(14, state.Users[2].Points);
-            Assert.AreEqual(2, state.Users[2].Placement);
-            Assert.AreEqual(1, state.Users[2].Rounds[2].Placement);
+            Assert.AreEqual(14, state.Users.GetOrAdd(2).Points);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(2).Rounds.GetOrAdd(2).Placement);
 
-            Assert.AreEqual(13, state.Users[3].Points);
-            Assert.AreEqual(3, state.Users[3].Placement);
-            Assert.AreEqual(3, state.Users[3].Rounds[2].Placement);
+            Assert.AreEqual(13, state.Users.GetOrAdd(3).Points);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).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(1, state.Users[1].Placement);
-            Assert.AreEqual(2, state.Users[1].Rounds[1].Placement);
+            Assert.AreEqual(7, state.Users.GetOrAdd(1).Points);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(1).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(7, state.Users[2].Points);
-            Assert.AreEqual(2, state.Users[2].Placement);
-            Assert.AreEqual(2, state.Users[2].Rounds[1].Placement);
+            Assert.AreEqual(7, state.Users.GetOrAdd(2).Points);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(5, state.Users[3].Points);
-            Assert.AreEqual(3, state.Users[3].Placement);
-            Assert.AreEqual(4, state.Users[3].Rounds[1].Placement);
+            Assert.AreEqual(5, state.Users.GetOrAdd(3).Points);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).Placement);
+            Assert.AreEqual(4, state.Users.GetOrAdd(3).Rounds.GetOrAdd(1).Placement);
 
-            Assert.AreEqual(5, state.Users[4].Points);
-            Assert.AreEqual(4, state.Users[4].Placement);
-            Assert.AreEqual(4, state.Users[4].Rounds[1].Placement);
+            Assert.AreEqual(5, state.Users.GetOrAdd(4).Points);
+            Assert.AreEqual(4, state.Users.GetOrAdd(4).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(2, state.Users[2].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).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(2, state.Users[2].Placement);
-            Assert.AreEqual(3, state.Users[3].Placement);
-            Assert.AreEqual(4, state.Users[4].Placement);
-            Assert.AreEqual(5, state.Users[5].Placement);
-            Assert.AreEqual(6, state.Users[6].Placement);
+            Assert.AreEqual(1, state.Users.GetOrAdd(1).Placement);
+            Assert.AreEqual(2, state.Users.GetOrAdd(2).Placement);
+            Assert.AreEqual(3, state.Users.GetOrAdd(3).Placement);
+            Assert.AreEqual(4, state.Users.GetOrAdd(4).Placement);
+            Assert.AreEqual(5, state.Users.GetOrAdd(5).Placement);
+            Assert.AreEqual(6, state.Users.GetOrAdd(6).Placement);
         }
     }
 }

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/TestSceneBeatmapSelectPanel.cs

@@ -1,11 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
@@ -62,5 +64,41 @@ namespace osu.Game.Tests.Visual.Matchmaking
                     panel.AllowSelection = value;
             });
         }
+
+        [Test]
+        public void TestFailedBeatmapLookup()
+        {
+            AddStep("setup request handle", () =>
+            {
+                var api = (DummyAPIAccess)API;
+                var handler = api.HandleRequest;
+                api.HandleRequest = req =>
+                {
+                    switch (req)
+                    {
+                        case GetBeatmapRequest:
+                        case GetBeatmapsRequest:
+                            req.TriggerFailure(new InvalidOperationException());
+                            return false;
+
+                        default:
+                            return handler?.Invoke(req) ?? false;
+                    }
+                };
+            });
+
+            AddStep("add panel", () =>
+            {
+                Child = new OsuContextMenuContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new BeatmapSelectPanel(new MultiplayerPlaylistItem())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+            });
+        }
     }
 }

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[user.UserID].Points = (8 - i) * 7;
-                    state.Users[user.UserID].Rounds[1].Placement = 1;
-                    state.Users[user.UserID].Rounds[1].TotalScore = 1;
-                    state.Users[user.UserID].Rounds[1].Statistics[HitResult.LargeBonus] = 1;
+                    state.Users.GetOrAdd(user.UserID).Placement = i++;
+                    state.Users.GetOrAdd(user.UserID).Points = (8 - i) * 7;
+                    state.Users.GetOrAdd(user.UserID).Rounds.GetOrAdd(1).Placement = 1;
+                    state.Users.GetOrAdd(user.UserID).Rounds.GetOrAdd(1).TotalScore = 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

@@ -153,7 +153,7 @@ 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();
             });

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[localUserId].Points = 8;
+                state.Users.GetOrAdd(localUserId).Placement = 1;
+                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[localUserId].Points = 8;
-                state.Users[invalid_user_id].Placement = 2;
-                state.Users[invalid_user_id].Points = 7;
+                state.Users.GetOrAdd(localUserId).Placement = 1;
+                state.Users.GetOrAdd(localUserId).Points = 8;
+                state.Users.GetOrAdd(invalid_user_id).Placement = 2;
+                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[invalid_user_id].Rounds[1].TotalScore = 990;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(1).TotalScore = 1000;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(1).TotalScore = 990;
 
                 // Highest accuracy.
-                state.Users[localUserId].Rounds[2].Accuracy = 0.9995;
-                state.Users[invalid_user_id].Rounds[2].Accuracy = 0.5;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(2).Accuracy = 0.9995;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(2).Accuracy = 0.5;
 
                 // Highest combo.
-                state.Users[localUserId].Rounds[3].MaxCombo = 100;
-                state.Users[invalid_user_id].Rounds[3].MaxCombo = 10;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(3).MaxCombo = 100;
+                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[invalid_user_id].Rounds[4].Statistics[HitResult.LargeBonus] = 25;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(4).Statistics[HitResult.LargeBonus] = 50;
+                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[invalid_user_id].Rounds[5].TotalScore = 999;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(5).TotalScore = 1000;
+                state.Users.GetOrAdd(invalid_user_id).Rounds.GetOrAdd(5).TotalScore = 999;
 
                 // Largest score difference.
-                state.Users[localUserId].Rounds[6].TotalScore = 1000;
-                state.Users[invalid_user_id].Rounds[6].TotalScore = 0;
+                state.Users.GetOrAdd(localUserId).Rounds.GetOrAdd(6).TotalScore = 1000;
+                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, 1453, 3468, 18_367, 48_342, 178_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,25 +16,35 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public partial class TestSceneDrawableDate : OsuTestScene
     {
-        public TestSceneDrawableDate()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            Child = new FillFlowContainer
+            AddStep("Create 7 dates", () =>
             {
-                Direction = FillDirection.Vertical,
-                AutoSizeAxes = Axes.Both,
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Children = new Drawable[]
+                Child = new FillFlowContainer
                 {
-                    new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(60))),
-                    new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(55))),
-                    new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(50))),
-                    new PokeyDrawableDate(DateTimeOffset.Now),
-                    new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(60))),
-                    new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(65))),
-                    new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(70))),
-                }
-            };
+                    Direction = FillDirection.Vertical,
+                    AutoSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(60))),
+                        new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(55))),
+                        new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(50))),
+                        new PokeyDrawableDate(DateTimeOffset.Now),
+                        new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(60))),
+                        new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(65))),
+                        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/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)
-                => other?.Date != null && Date.Equals(other.Date);
-
-            public bool Equals(ILocalisableStringData? other)
-                => other is HumanisedDate otherDate && Equals(otherDate);
+            /// <remarks>
+            /// 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"/>
+            /// should have the effect of replacing and re-formatting the text.
+            /// 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/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/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

@@ -21,27 +21,24 @@ namespace osu.Game.Online.Multiplayer.MatchTypes.Matchmaking
         [Key(0)]
         public IDictionary<int, MatchmakingRound> RoundsDictionary { get; set; } = new Dictionary<int, MatchmakingRound>();
 
-        /// <summary>
-        /// Creates or retrieves the score for the given round.
-        /// </summary>
-        /// <param name="round">The round.</param>
-        public MatchmakingRound this[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;
 
+        /// <summary>
+        /// Retrieves or adds a <see cref="MatchmakingRound"/> entry to this list.
+        /// </summary>
+        /// <param name="round">The round.</param>
+        public MatchmakingRound GetOrAdd(int round)
+        {
+            if (RoundsDictionary.TryGetValue(round, out MatchmakingRound? score))
+                return score;
+
+            return RoundsDictionary[round] = new MatchmakingRound { Round = round };
+        }
+
         public IEnumerator<MatchmakingRound> GetEnumerator() => RoundsDictionary.Values.GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator() => 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

@@ -21,27 +21,24 @@ namespace osu.Game.Online.Multiplayer.MatchTypes.Matchmaking
         [Key(0)]
         public IDictionary<int, MatchmakingUser> UserDictionary { get; set; } = new Dictionary<int, MatchmakingUser>();
 
-        /// <summary>
-        /// Creates or retrieves the user for the given id.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        public MatchmakingUser this[int userId]
-        {
-            get
-            {
-                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;
 
+        /// <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 };
+        }
+
         public IEnumerator<MatchmakingUser> GetEnumerator() => UserDictionary.Values.GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator() => 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/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,7 +91,12 @@ 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/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.0025)
+                return RankingTier.Rhodium;
+
+            if (percent < 0.005)
+                return RankingTier.Platinum;
+
+            if (percent < 0.025)
+                return RankingTier.Gold;
+
+            if (percent < 0.05)
+                return RankingTier.Silver;
+
+            if (percent < 0.25)
+                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)
-                                {
-                                    Title = UsersStrings.ShowRankGlobalSimple,
-                                },
+                                detailGlobalRank = new GlobalRankDisplay(),
                                 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";
-            ppInfo.Content = user?.Statistics?.PP?.ToLocalisableString("#,##0") ?? (LocalisableString)"0";
+            medalInfo.Content.Text = user?.Achievements?.Length.ToString() ?? "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.ContentTooltipText = getGlobalRankTooltipText(user);
+            detailGlobalRank.HighestRank.Value = user?.RankHighest;
+            detailGlobalRank.UserStatistics.Value = user?.Statistics;
 
-            detailCountryRank.Content = user?.Statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
-            detailCountryRank.ContentTooltipText = getCountryRankTooltipText(user);
+            detailCountryRank.Content.Text = user?.Statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? (LocalisableString)"-";
+            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
-        {
-            set => content.Text = value;
-        }
-
-        public LocalisableString ContentTooltipText
-        {
-            set => content.TooltipText = value;
-        }
+        public ContentText Content { get; }
 
         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 = formatTime(playTime);
+            info.Content.TooltipText = (playTime ?? 0) / 3600 + " hours";
+            info.Content.Text = formatTime(playTime);
         }
 
         private string formatTime(int? secondsNull)

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,24 +331,33 @@ namespace osu.Game.Overlays.SkinEditor
         private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
         private LeasedBindable<bool>? leasedBeatmapSkins;
 
-        private void globallyDisableBeatmapSkinSetting()
-        {
-            if (beatmapSkins.Disabled)
-                return;
+        private readonly Bindable<HUDVisibilityMode> configVisibilityMode = new Bindable<HUDVisibilityMode>();
+        private LeasedBindable<HUDVisibilityMode>? leasedVisibilityMode;
 
-            // 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.
-            //
-            // This causes a full reload of the skin, which is pretty ugly.
-            // TODO: Investigate if we can avoid this when a beatmap skin is not being applied by the current beatmap.
-            leasedBeatmapSkins = beatmapSkins.BeginLease(true);
-            leasedBeatmapSkins.Value = false;
+        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.
+                //
+                // This causes a full reload of the skin, which is pretty ugly.
+                // TODO: Investigate if we can avoid this when a beatmap skin is not being applied by the current beatmap.
+                leasedBeatmapSkins = beatmapSkins.BeginLease(true);
+                leasedBeatmapSkins.Value = false;
+            }
+
+            leasedVisibilityMode = configVisibilityMode.BeginLease(true);
+            leasedVisibilityMode.Value = HUDVisibilityMode.Always;
         }
 
-        private void globallyReenableBeatmapSkinSetting()
+        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/UI/RulesetInputManager.cs

@@ -70,9 +70,7 @@ namespace osu.Game.Rulesets.UI
         {
             rulesetKeyBindingContainer = createRulesetKeyBindingContainer(ruleset, variant, unique);
 
-            InternalChild = KeyBindingContainer =
-                rulesetKeyBindingContainer
-                    .WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
+            InternalChild = KeyBindingContainer = CreateKeyBindingContainer(ruleset, variant, unique).WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader(true)]

osu.Game/Screens/Menu/MainMenu.cs

@@ -486,7 +486,7 @@ namespace osu.Game.Screens.Menu
 
         private void loadSongSelect() => this.Push(forceSSV1.Value ? new PlaySongSelect() : new SoloSongSelect());
 
-        private void joinOrLeaveMatchmakingQueue() => this.Push(new OnlinePlay.Matchmaking.Intro.IntroScreen());
+        private void joinOrLeaveMatchmakingQueue() => this.Push(new OnlinePlay.Matchmaking.Intro.ScreenIntro());
 
         private partial class MobileDisclaimerDialog : PopupDialog
         {

osu.Game/Screens/OnlinePlay/Matchmaking/Intro/ScreenIntro.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Intro
     /// <summary>
     /// A brief intro animation that introduces matchmaking to the user.
     /// </summary>
-    public partial class IntroScreen : OsuScreen
+    public partial class ScreenIntro : OsuScreen
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Intro
 
         protected override BackgroundScreen CreateBackground() => new MatchmakingIntroBackgroundScreen(colourProvider);
 
-        public IntroScreen()
+        public ScreenIntro()
         {
             ValidForResume = false;
         }

osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapCardMatchmaking.cs

@@ -53,6 +53,9 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        [Resolved]
+        private BeatmapSetOverlay? beatmapSetOverlay { get; set; }
+
         public BeatmapCardMatchmaking(APIBeatmap beatmap)
             : base(beatmap.BeatmapSet!, false)
         {
@@ -319,7 +322,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
             {
                 List<MenuItem> items = new List<MenuItem>
                 {
-                    new OsuMenuItem(ContextMenuStrings.ViewBeatmap, MenuItemType.Highlighted, DefaultAction)
+                    new OsuMenuItem(ContextMenuStrings.ViewBeatmap, MenuItemType.Highlighted, () => beatmapSetOverlay?.FetchAndShowBeatmap(beatmap.OnlineID))
                 };
 
                 foreach (var button in buttonContainer.Buttons)

osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectPanel.cs

@@ -111,7 +111,17 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
             {
                 Debug.Assert(card == null);
 
-                var beatmap = b.GetResultSafely()!;
+                APIBeatmap beatmap = b.GetResultSafely() ?? new APIBeatmap
+                {
+                    BeatmapSet = new APIBeatmapSet
+                    {
+                        Title = "unknown beatmap",
+                        TitleUnicode = "unknown beatmap",
+                        Artist = "unknown artist",
+                        ArtistUnicode = "unknown artist",
+                    }
+                };
+
                 beatmap.StarRating = Item.StarRating;
 
                 mainContent.Add(card = new BeatmapCardMatchmaking(beatmap)

osu.Game/Screens/OnlinePlay/Matchmaking/Match/PlayerPanel.cs

@@ -20,6 +20,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
+using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
@@ -27,6 +28,7 @@ using osu.Game.Online.Matchmaking.Events;
 using osu.Game.Online.Metadata;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results;
@@ -107,6 +109,8 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
         private BufferedContainer backgroundQuitTarget = null!;
         private BufferedContainer avatarQuitTarget = null!;
 
+        private Box downloadProgressBar = null!;
+
         private PlayerPanelDisplayMode displayMode = PlayerPanelDisplayMode.Horizontal;
         private bool hasQuit;
 
@@ -158,80 +162,91 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
-                        Child = mainContent = new Container
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new[]
+                            mainContent = new Container
                             {
-                                quitText = new OsuSpriteText
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new[]
                                 {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Text = "QUIT",
-                                    Font = OsuFont.Default.With(weight: "Bold", size: 70),
-                                    Rotation = -22.5f,
-                                    Colour = OsuColour.Gray(0.3f),
-                                    Blending = BlendingParameters.Additive
-                                },
-                                avatarPositionTarget = new Container
-                                {
-                                    Origin = Anchor.Centre,
-                                    Size = avatar_size,
-                                    Child = avatarJumpTarget = new Container
+                                    quitText = new OsuSpriteText
                                     {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Text = "QUIT",
+                                        Font = OsuFont.Default.With(weight: "Bold", size: 70),
+                                        Rotation = -22.5f,
+                                        Colour = OsuColour.Gray(0.3f),
+                                        Blending = BlendingParameters.Additive
+                                    },
+                                    avatarPositionTarget = new Container
+                                    {
+                                        Origin = Anchor.Centre,
+                                        Size = avatar_size,
+                                        Child = avatarJumpTarget = new Container
+                                        {
+                                            Anchor = Anchor.BottomCentre,
+                                            Origin = Anchor.BottomCentre,
+                                            RelativeSizeAxes = Axes.Both,
+                                            Child = avatar = new Container
+                                            {
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre,
+                                                RelativeSizeAxes = Axes.Both,
+                                                // Needs to be re-buffered as the avatar is proxied outside of the parent buffered container.
+                                                Child = avatarQuitTarget = new BufferedContainer
+                                                {
+                                                    FrameBufferScale = new Vector2(1.5f),
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Child = new MatchmakingAvatar(User, isOwnUser: User.Id == api.LocalUser.Value.Id)
+                                                    {
+                                                        Anchor = Anchor.Centre,
+                                                        Origin = Anchor.Centre,
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Size = Vector2.One
+                                                    }
+                                                }
+                                            },
+                                        }
+                                    },
+                                    rankText = new OsuSpriteText
+                                    {
+                                        Alpha = 0,
+                                        Anchor = Anchor.BottomRight,
+                                        Origin = Anchor.BottomCentre,
+                                        Blending = BlendingParameters.Additive,
+                                        Margin = new MarginPadding(4),
+                                        Text = "-",
+                                        Font = OsuFont.Style.Title.With(size: 55),
+                                    },
+                                    username = new OsuSpriteText
+                                    {
+                                        Alpha = 0,
                                         Anchor = Anchor.BottomCentre,
                                         Origin = Anchor.BottomCentre,
-                                        RelativeSizeAxes = Axes.Both,
-                                        Child = avatar = new Container
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            RelativeSizeAxes = Axes.Both,
-                                            // Needs to be re-buffered as the avatar is proxied outside of the parent buffered container.
-                                            Child = avatarQuitTarget = new BufferedContainer
-                                            {
-                                                FrameBufferScale = new Vector2(1.5f),
-                                                RelativeSizeAxes = Axes.Both,
-                                                Child = new MatchmakingAvatar(User, isOwnUser: User.Id == api.LocalUser.Value.Id)
-                                                {
-                                                    Anchor = Anchor.Centre,
-                                                    Origin = Anchor.Centre,
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Size = Vector2.One
-                                                }
-                                            }
-                                        },
+                                        Text = User.Username,
+                                        Font = OsuFont.Style.Heading1,
+                                    },
+                                    scoreText = new OsuSpriteText
+                                    {
+                                        Alpha = 0,
+                                        Margin = new MarginPadding(10),
+                                        Anchor = Anchor.BottomCentre,
+                                        Origin = Anchor.BottomCentre,
+                                        Font = OsuFont.Style.Heading2,
+                                        Text = "0 pts"
                                     }
-                                },
-                                rankText = new OsuSpriteText
-                                {
-                                    Alpha = 0,
-                                    Anchor = Anchor.BottomRight,
-                                    Origin = Anchor.BottomCentre,
-                                    Blending = BlendingParameters.Additive,
-                                    Margin = new MarginPadding(4),
-                                    Text = "-",
-                                    Font = OsuFont.Style.Title.With(size: 55),
-                                },
-                                username = new OsuSpriteText
-                                {
-                                    Alpha = 0,
-                                    Anchor = Anchor.BottomCentre,
-                                    Origin = Anchor.BottomCentre,
-                                    Text = User.Username,
-                                    Font = OsuFont.Style.Heading1,
-                                },
-                                scoreText = new OsuSpriteText
-                                {
-                                    Alpha = 0,
-                                    Margin = new MarginPadding(10),
-                                    Anchor = Anchor.BottomCentre,
-                                    Origin = Anchor.BottomCentre,
-                                    Font = OsuFont.Style.Heading2,
-                                    Text = "0 pts"
                                 }
+                            },
+                            downloadProgressBar = new Box
+                            {
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                RelativeSizeAxes = Axes.X,
+                                Size = new Vector2(0, 4),
+                                Colour = colourProvider?.Content2 ?? colours.Gray3
                             }
                         }
                     }
@@ -250,6 +265,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
 
             client.MatchRoomStateChanged += onRoomStateChanged;
             client.MatchEvent += onMatchEvent;
+            client.BeatmapAvailabilityChanged += onBeatmapAvailabilityChanged;
 
             onRoomStateChanged(client.Room!.MatchState);
 
@@ -414,8 +430,11 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
             if (!matchmakingState.Users.UserDictionary.TryGetValue(User.Id, out MatchmakingUser? userScore))
                 return;
 
-            rankText.Text = userScore.Placement.Ordinalize(CultureInfo.CurrentCulture);
-            rankText.FadeColour(SubScreenResults.ColourForPlacement(userScore.Placement));
+            if (userScore.Placement == null)
+                return;
+
+            rankText.Text = userScore.Placement.Value.Ordinalize(CultureInfo.CurrentCulture);
+            rankText.FadeColour(SubScreenResults.ColourForPlacement(userScore.Placement.Value));
             scoreText.Text = $"{userScore.Points} pts";
         });
 
@@ -469,6 +488,16 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
             }
         }
 
+        private void onBeatmapAvailabilityChanged(MultiplayerRoomUser user, BeatmapAvailability availability) => Scheduler.Add(() =>
+        {
+            if (availability.State == DownloadState.Downloading)
+                downloadProgressBar.FadeIn(200, Easing.OutPow10);
+            else
+                downloadProgressBar.FadeOut(200, Easing.OutPow10);
+
+            downloadProgressBar.ResizeWidthTo(availability.DownloadProgress ?? 0, 200, Easing.OutPow10);
+        });
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -477,6 +506,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
             {
                 client.MatchRoomStateChanged -= onRoomStateChanged;
                 client.MatchEvent -= onMatchEvent;
+                client.BeatmapAvailabilityChanged -= onBeatmapAvailabilityChanged;
             }
         }
 

osu.Game/Screens/OnlinePlay/Matchmaking/Match/PlayerPanelOverlay.cs

@@ -239,8 +239,8 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match
                     if (client.Room?.MatchState is not MatchmakingRoomState matchmakingState)
                         continue;
 
-                    if (matchmakingState.Users.UserDictionary.TryGetValue(panels[i].User.Id, out MatchmakingUser? user))
-                        SetLayoutPosition(Children[i], user.Placement);
+                    if (matchmakingState.Users.UserDictionary.TryGetValue(panels[i].User.Id, out MatchmakingUser? user) && user.Placement != null)
+                        SetLayoutPosition(Children[i], user.Placement.Value);
                     else
                         SetLayoutPosition(Children[i], float.MaxValue);
                 }

osu.Game/Screens/OnlinePlay/Matchmaking/Match/Results/SubScreenResults.cs

@@ -194,20 +194,25 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results
         {
             userStatistics.Clear();
 
-            if (state.Users[client.LocalUser!.UserID].Rounds.Count == 0)
+            var localUserState = state.Users.GetOrAdd(client.LocalUser!.UserID);
+
+            if (localUserState.Rounds.Count == 0)
             {
                 placementText.Text = "-";
                 placementText.Colour = OsuColour.Gray(1f);
                 return;
             }
 
-            int overallPlacement = state.Users[client.LocalUser!.UserID].Placement;
+            int? overallPlacement = localUserState.Placement;
 
-            placementText.Text = overallPlacement.Ordinalize(CultureInfo.CurrentCulture);
-            placementText.Colour = ColourForPlacement(overallPlacement);
+            if (overallPlacement != null)
+            {
+                placementText.Text = overallPlacement.Value.Ordinalize(CultureInfo.CurrentCulture);
+                placementText.Colour = ColourForPlacement(overallPlacement.Value);
 
-            int overallPoints = state.Users[client.LocalUser!.UserID].Points;
-            addStatistic(overallPlacement, $"Overall position ({overallPoints} points)");
+                int overallPoints = localUserState.Points;
+                addStatistic(overallPlacement.Value, $"Overall position ({overallPoints} points)");
+            }
 
             var accuracyOrderedUsers = state.Users.Select(u => (user: u, avgAcc: u.Rounds.Select(r => r.Accuracy).DefaultIfEmpty(0).Average()))
                                             .OrderByDescending(t => t.avgAcc)
@@ -216,15 +221,16 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results
             int accuracyPlacement = accuracyOrderedUsers.index + 1;
             addStatistic(accuracyPlacement, $"Overall accuracy ({accuracyOrderedUsers.info.avgAcc.FormatAccuracy()})");
 
-            var maxComboOrderedUsers = state.Users.Select(u => (user: u, maxCombo: u.Rounds.Max(r => r.MaxCombo)))
+            var maxComboOrderedUsers = state.Users.Select(u => (user: u, maxCombo: u.Rounds.Select(r => r.MaxCombo).DefaultIfEmpty(0).Max()))
                                             .OrderByDescending(t => t.maxCombo)
                                             .Select((t, i) => (info: t, index: i))
                                             .Single(t => t.info.user.UserId == client.LocalUser!.UserID);
             int maxComboPlacement = maxComboOrderedUsers.index + 1;
             addStatistic(maxComboPlacement, $"Best max combo ({maxComboOrderedUsers.info.maxCombo}x)");
 
-            var bestPlacement = state.Users[client.LocalUser!.UserID].Rounds.MinBy(r => r.Placement);
-            addStatistic(bestPlacement!.Placement, $"Best round placement (round {bestPlacement.Round})");
+            var bestPlacement = localUserState.Rounds.MinBy(r => r.Placement);
+            if (bestPlacement != null)
+                addStatistic(bestPlacement.Placement, $"Best round placement (round {bestPlacement.Round})");
 
             void addStatistic(int position, string text) => userStatistics.Add(new PanelUserStatistic(position, text));
         }
@@ -255,27 +261,27 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results
             roomAwards.Clear();
 
             long maxScore = long.MinValue;
-            int maxScoreUserId = 0;
+            int maxScoreUserId = -1;
 
             double maxAccuracy = double.MinValue;
-            int maxAccuracyUserId = 0;
+            int maxAccuracyUserId = -1;
 
             int maxCombo = int.MinValue;
-            int maxComboUserId = 0;
+            int maxComboUserId = -1;
 
             long maxBonusScore = 0;
-            int maxBonusScoreUserId = 0;
+            int maxBonusScoreUserId = -1;
 
             long largestScoreDifference = long.MinValue;
-            int largestScoreDifferenceUserId = 0;
+            int largestScoreDifferenceUserId = -1;
 
             long smallestScoreDifference = long.MaxValue;
-            int smallestScoreDifferenceUserId = 0;
+            int smallestScoreDifferenceUserId = -1;
 
             for (int round = 1; round <= state.CurrentRound; round++)
             {
                 long roundHighestScore = long.MinValue;
-                int roundHighestScoreUserId = 0;
+                int roundHighestScoreUserId = -1;
 
                 long roundLowestScore = long.MaxValue;
 
@@ -344,11 +350,14 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.Results
                 }
             }
 
-            addAward(maxScoreUserId, "Score champ", "Highest score in a single round");
+            if (maxScoreUserId > 0)
+                addAward(maxScoreUserId, "Score champ", "Highest score in a single round");
 
-            addAward(maxAccuracyUserId, "Most accurate", "Highest accuracy in a single round");
+            if (maxAccuracyUserId > 0)
+                addAward(maxAccuracyUserId, "Most accurate", "Highest accuracy in a single round");
 
-            addAward(maxComboUserId, "Top combo", "Highest combo in a single round");
+            if (maxComboUserId > 0)
+                addAward(maxComboUserId, "Top combo", "Highest combo in a single round");
 
             if (maxBonusScoreUserId > 0)
                 addAward(maxBonusScoreUserId, "Biggest bonus", "Biggest bonus score across all rounds");

osu.Game/Screens/OnlinePlay/Matchmaking/Queue/QueueController.cs

@@ -2,10 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
+using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
@@ -32,11 +37,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
         [Resolved]
         private INotificationOverlay? notifications { get; set; }
 
-        [Resolved]
-        private IPerformFromScreenRunner? performer { get; set; }
-
-        private ProgressNotification? backgroundNotification;
-        private Notification? readyNotification;
+        private BackgroundQueueNotification? backgroundNotification;
         private bool isBackgrounded;
 
         protected override void LoadComplete()
@@ -118,27 +119,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
             if (backgroundNotification != null)
                 return;
 
-            notifications?.Post(backgroundNotification = new ProgressNotification
-            {
-                Text = "Searching for opponents...",
-                CompletionTarget = n => notifications.Post(readyNotification = n),
-                CompletionText = "Your match is ready! Click to join.",
-                CompletionClickAction = () =>
-                {
-                    client.MatchmakingAcceptInvitation().FireAndForget();
-                    performer?.PerformFromScreen(s => s.Push(new IntroScreen()));
-
-                    closeNotifications();
-                    return true;
-                },
-                CancelRequested = () =>
-                {
-                    client.MatchmakingLeaveQueue().FireAndForget();
-
-                    closeNotifications();
-                    return true;
-                }
-            });
+            notifications?.Post(backgroundNotification = new BackgroundQueueNotification(this));
         }
 
         private void closeNotifications()
@@ -146,13 +127,9 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
             if (backgroundNotification != null)
             {
                 backgroundNotification.State = ProgressNotificationState.Cancelled;
-                backgroundNotification.Close(false);
+                backgroundNotification.CloseAll();
+                backgroundNotification = null;
             }
-
-            readyNotification?.Close(false);
-
-            backgroundNotification = null;
-            readyNotification = null;
         }
 
         protected override void Dispose(bool isDisposing)
@@ -168,5 +145,87 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
                 client.MatchmakingRoomReady -= onMatchmakingRoomReady;
             }
         }
+
+        private partial class BackgroundQueueNotification : ProgressNotification
+        {
+            [Resolved]
+            private IPerformFromScreenRunner? performer { get; set; }
+
+            [Resolved]
+            private MultiplayerClient client { get; set; } = null!;
+
+            private readonly QueueController controller;
+
+            private Notification? foundNotification;
+            private Sample? matchFoundSample;
+
+            public BackgroundQueueNotification(QueueController controller)
+            {
+                this.controller = controller;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                Text = "Searching for opponents...";
+
+                CompletionClickAction = () =>
+                {
+                    client.MatchmakingAcceptInvitation().FireAndForget();
+                    controller.CurrentState.Value = ScreenQueue.MatchmakingScreenState.AcceptedWaitingForRoom;
+
+                    performer?.PerformFromScreen(s => s.Push(new ScreenIntro()));
+
+                    Close(false);
+                    return true;
+                };
+
+                CancelRequested = () =>
+                {
+                    client.MatchmakingLeaveQueue().FireAndForget();
+                    return true;
+                };
+
+                matchFoundSample = audio.Samples.Get(@"Multiplayer/Matchmaking/match-found");
+            }
+
+            protected override Notification CreateCompletionNotification()
+            {
+                // Playing here means it will play even if notification overlay is hidden.
+                //
+                // If we add support for the completion notification to be processed during gameplay,
+                // this can be moved inside the `MatchFoundNotification` implementation.
+                matchFoundSample?.Play();
+
+                return foundNotification = new MatchFoundNotification
+                {
+                    Activated = CompletionClickAction,
+                    Text = "Your match is ready! Click to join.",
+                };
+            }
+
+            public void CloseAll()
+            {
+                foundNotification?.Close(false);
+                Close(false);
+            }
+
+            public partial class MatchFoundNotification : ProgressCompletionNotification
+            {
+                protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
+
+                public MatchFoundNotification()
+                {
+                    IsCritical = true;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    Icon = FontAwesome.Solid.Bolt;
+                    IconContent.Colour = ColourInfo.GradientVertical(colours.YellowDark, colours.YellowLight);
+                }
+            }
+        }
     }
 }

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs

@@ -56,7 +56,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 AllowPause = false,
                 AllowRestart = false,
-                AllowSkipping = room.AutoSkip,
                 AutomaticallySkipIntro = room.AutoSkip,
                 ShowLeaderboard = true,
             })
@@ -121,6 +120,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             client.GameplayStarted += onGameplayStarted;
             client.ResultsReady += onResultsReady;
+            client.VoteToSkipIntroPassed += onVoteToSkipIntroPassed;
 
             ScoreProcessor.HasCompleted.BindValueChanged(_ =>
             {
@@ -148,6 +148,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Debug.Assert(client.Room != null);
         }
 
+        protected override SkipOverlay CreateSkipOverlay(double startTime) => new MultiplayerSkipOverlay(startTime);
+
         protected override void StartGameplay()
         {
             // We can enter this screen one of two ways:
@@ -219,6 +221,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60))).ConfigureAwait(false);
         }
 
+        protected override void RequestIntroSkip()
+        {
+            // If the room is set up such that the intro is automatically skipped, there's no need to vote on it.
+            if (Configuration.AutomaticallySkipIntro)
+            {
+                base.RequestIntroSkip();
+                return;
+            }
+
+            // No base call because we aren't skipping yet.
+            client.VoteToSkipIntro().FireAndForget();
+        }
+
+        private void onVoteToSkipIntroPassed()
+        {
+            Schedule(() => PerformIntroSkip(true));
+        }
+
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(Room.RoomID != null);
@@ -242,6 +262,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 client.GameplayStarted -= onGameplayStarted;
                 client.ResultsReady -= onResultsReady;
+                client.VoteToSkipIntroPassed -= onVoteToSkipIntroPassed;
             }
         }
     }

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerSkipOverlay.cs

@@ -0,0 +1,133 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Play;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
+{
+    public partial class MultiplayerSkipOverlay : SkipOverlay
+    {
+        [Resolved]
+        private MultiplayerClient client { get; set; } = null!;
+
+        private Drawable votedIcon = null!;
+        private OsuSpriteText countText = null!;
+
+        public MultiplayerSkipOverlay(double startTime)
+            : base(startTime)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            FadingContent.AddRange(
+            [
+                votedIcon = new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Position = new Vector2(50, 0),
+                    Size = new Vector2(20),
+                    Alpha = 0,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Green
+                        },
+                        new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Scale = new Vector2(0.5f),
+                            Icon = FontAwesome.Solid.Check
+                        }
+                    }
+                },
+                countText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.Centre,
+                    RelativePositionAxes = Axes.X,
+                    Position = new Vector2(0.75f, 0),
+                    Font = OsuFont.Default.With(size: 36, weight: FontWeight.Bold)
+                }
+            ]);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            client.UserLeft += onUserLeft;
+            client.UserStateChanged += onUserStateChanged;
+            client.UserVotedToSkipIntro += onUserVotedToSkipIntro;
+
+            updateText();
+        }
+
+        private void onUserLeft(MultiplayerRoomUser user)
+        {
+            Schedule(updateText);
+        }
+
+        private void onUserStateChanged(MultiplayerRoomUser user, MultiplayerUserState state)
+        {
+            Schedule(updateText);
+        }
+
+        private void onUserVotedToSkipIntro(int userId) => Schedule(() =>
+        {
+            updateText();
+
+            countText.ScaleTo(1.5f).ScaleTo(1, 200, Easing.OutSine);
+
+            if (userId == client.LocalUser?.UserID)
+            {
+                votedIcon.ScaleTo(1.5f).ScaleTo(1, 200, Easing.OutSine);
+                votedIcon.FadeInFromZero(100);
+            }
+        });
+
+        private void updateText()
+        {
+            if (client.Room == null || client.Room.Settings.AutoSkip)
+                return;
+
+            int countTotal = client.Room.Users.Count(u => u.State == MultiplayerUserState.Playing);
+            int countSkipped = client.Room.Users.Count(u => u.State == MultiplayerUserState.Playing && u.VotedToSkipIntro);
+            int countRequired = countTotal / 2 + 1;
+
+            countText.Text = $"{Math.Min(countRequired, countSkipped)} / {countRequired}";
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (client.IsNotNull())
+            {
+                client.UserLeft -= onUserLeft;
+                client.UserStateChanged -= onUserStateChanged;
+                client.UserVotedToSkipIntro -= onUserVotedToSkipIntro;
+            }
+        }
+    }
+}

osu.Game/Screens/Play/HUD/SkinnableBeatmapSetOnlineStatusPill.cs

@@ -1,24 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
-using System.Threading;
-using JetBrains.Annotations;
-using Microsoft.Extensions.Logging;
 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.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Localisation.SkinComponents;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -47,7 +35,7 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
             beatmap.BindValueChanged(b =>
             {
-                beatmapSetOnlineStatusPill.Status = beatmap.Value.BeatmapSetInfo.Status;
+                beatmapSetOnlineStatusPill.Status = beatmap.Value.BeatmapInfo.Status;
             }, true);
         }
 

osu.Game/Screens/Play/MasterGameplayClockContainer.cs

@@ -115,14 +115,15 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Skip forward to the next valid skip point.
         /// </summary>
-        public void Skip()
+        /// <param name="fullLength"><c>true</c> to skip as close to gameplay as possible, or <c>false</c> to skip only to the next valid skip point.</param>
+        public void Skip(bool fullLength = false)
         {
             if (GameplayClock.CurrentTime > GameplayStartTime - MINIMUM_SKIP_TIME)
                 return;
 
             double skipTarget = GameplayStartTime - MINIMUM_SKIP_TIME;
 
-            if (StartTime < -10000 && GameplayClock.CurrentTime < 0 && skipTarget > 6000)
+            if (!fullLength && StartTime < -10000 && GameplayClock.CurrentTime < 0 && skipTarget > 6000)
                 // double skip exception for storyboards with very long intros
                 skipTarget = 0;
 

osu.Game/Screens/Play/Player.cs

@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Play
 
         private BreakTracker breakTracker;
 
-        private SkipOverlay skipIntroOverlay;
+        protected SkipOverlay SkipIntroOverlay { get; private set; }
         private SkipOverlay skipOutroOverlay;
 
         protected ScoreProcessor ScoreProcessor { get; private set; }
@@ -503,10 +503,10 @@ namespace osu.Game.Screens.Play
                     },
                     // display the cursor above some HUD elements.
                     DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
-                    skipIntroOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
+                    SkipIntroOverlay = CreateSkipOverlay(DrawableRuleset.GameplayStartTime).With(o =>
                     {
-                        RequestSkip = performUserRequestedSkip
-                    },
+                        o.RequestSkip = RequestIntroSkip;
+                    }),
                     skipOutroOverlay = new SkipOverlay(GameplayState.Storyboard.LatestEventTime ?? 0)
                     {
                         RequestSkip = () => progressToResults(false),
@@ -526,13 +526,15 @@ namespace osu.Game.Screens.Play
 
             if (!Configuration.AllowSkipping || !DrawableRuleset.AllowGameplayOverlays)
             {
-                skipIntroOverlay.Expire();
+                SkipIntroOverlay.Expire();
                 skipOutroOverlay.Expire();
             }
 
             return container;
         }
 
+        protected virtual SkipOverlay CreateSkipOverlay(double startTime) => new SkipOverlay(startTime);
+
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
             updateGameplayState();
@@ -719,13 +721,22 @@ namespace osu.Game.Screens.Play
             PerformExit();
         }
 
-        private void performUserRequestedSkip()
+        protected virtual void RequestIntroSkip()
+        {
+            PerformIntroSkip();
+        }
+
+        /// <summary>
+        /// Skip forward to the next valid skip point.
+        /// </summary>
+        /// <param name="fullLength"><c>true</c> to skip as close to gameplay as possible, or <c>false</c> to skip only to the next valid skip point.</param>
+        protected void PerformIntroSkip(bool fullLength = false)
         {
             // user requested skip
             // disable sample playback to stop currently playing samples and perform skip
             samplePlaybackDisabled.Value = true;
 
-            (GameplayClockContainer as MasterGameplayClockContainer)?.Skip();
+            (GameplayClockContainer as MasterGameplayClockContainer)?.Skip(fullLength);
 
             // return samplePlaybackDisabled.Value to what is defined by the beatmap's current state
             updateSampleDisabledState();
@@ -1180,7 +1191,7 @@ namespace osu.Game.Screens.Play
             GameplayClockContainer.Reset(startClock: true);
 
             if (Configuration.AutomaticallySkipIntro)
-                skipIntroOverlay.SkipWhenReady();
+                SkipIntroOverlay.SkipWhenReady();
         }
 
         public override void OnSuspending(ScreenTransitionEvent e)

osu.Game/Screens/Play/SkipOverlay.cs

@@ -38,20 +38,21 @@ namespace osu.Game.Screens.Play
         private readonly double startTime;
 
         public Action RequestSkip;
+
+        protected FadeContainer FadingContent { get; private set; }
+
         private Button button;
         private ButtonContainer buttonContainer;
         private Circle remainingTimeBox;
 
-        private FadeContainer fadeContainer;
         private double displayTime;
-
         private bool isClickable;
         private bool skipQueued;
 
         [Resolved]
         private IGameplayClock gameplayClock { get; set; }
 
-        internal bool IsButtonVisible => fadeContainer.State == Visibility.Visible && buttonContainer.State.Value == Visibility.Visible;
+        internal bool IsButtonVisible => FadingContent.State == Visibility.Visible && buttonContainer.State.Value == Visibility.Visible;
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         /// <summary>
@@ -77,7 +78,7 @@ namespace osu.Game.Screens.Play
             InternalChild = buttonContainer = new ButtonContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = fadeContainer = new FadeContainer
+                Child = FadingContent = new FadeContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
@@ -107,13 +108,13 @@ namespace osu.Game.Screens.Play
         public override void Hide()
         {
             base.Hide();
-            fadeContainer.Hide();
+            FadingContent.Hide();
         }
 
         public override void Show()
         {
             base.Show();
-            fadeContainer.TriggerShow();
+            FadingContent.TriggerShow();
         }
 
         protected override void LoadComplete()
@@ -136,7 +137,7 @@ namespace osu.Game.Screens.Play
                 RequestSkip?.Invoke();
             };
 
-            fadeContainer.TriggerShow();
+            FadingContent.TriggerShow();
         }
 
         /// <summary>
@@ -183,7 +184,7 @@ namespace osu.Game.Screens.Play
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             if (isClickable && !e.HasAnyButtonPressed)
-                fadeContainer.TriggerShow();
+                FadingContent.TriggerShow();
 
             return base.OnMouseMove(e);
         }

osu.Game/Screens/SelectV2/BeatmapCarousel.cs

@@ -497,25 +497,35 @@ namespace osu.Game.Screens.SelectV2
             // The filter might have changed the set of available groups, which means that the current selection may point to a stale group.
             // Check whether that is the case.
             bool groupingRemainsOff = currentGroupedBeatmap?.Group == null && grouping.GroupItems.Count == 0;
-            bool groupStillExists = currentGroupedBeatmap?.Group != null && grouping.GroupItems.ContainsKey(currentGroupedBeatmap.Group);
 
-            if (groupingRemainsOff || groupStillExists)
+            bool groupStillValid = false;
+
+            if (currentGroupedBeatmap?.Group != null)
+            {
+                groupStillValid = grouping.GroupItems.TryGetValue(currentGroupedBeatmap.Group, out var items)
+                                  && items.Any(i => CheckModelEquality(i.Model, currentGroupedBeatmap));
+            }
+
+            if (groupingRemainsOff || groupStillValid)
             {
                 // Only update the visual state of the selected item.
                 HandleItemSelected(currentGroupedBeatmap);
             }
             else if (currentGroupedBeatmap != null)
             {
-                // If the group no longer exists, grab an arbitrary other instance of the beatmap under the first group encountered.
+                // If the group no longer exists (or the item no longer exists in the previous group), grab an arbitrary other instance of the beatmap under the first group encountered.
                 var newSelection = GetCarouselItems()?.Select(i => i.Model).OfType<GroupedBeatmap>().FirstOrDefault(gb => gb.Beatmap.Equals(currentGroupedBeatmap.Beatmap));
+
                 // Only change the selection if we actually got a positive hit.
                 // This is necessary so that selection isn't lost if the panel reappears later due to e.g. unapplying some filter criteria that made it disappear in the first place.
                 if (newSelection != null)
+                {
                     CurrentSelection = newSelection;
+                    groupForReselection = newSelection.Group;
+                }
             }
 
             // If a group was selected that is not the one containing the selection, attempt to reselect it.
-            // If the original group was not found, ExpandedGroup will already have been updated to a valid value in `HandleItemSelected` above.
             if (groupForReselection != null && grouping.GroupItems.TryGetValue(groupForReselection, out _))
                 setExpandedGroup(groupForReselection);
         }
@@ -689,7 +699,7 @@ namespace osu.Game.Screens.SelectV2
 
             var groupItem = GetCarouselItems()?.FirstOrDefault(i => CheckModelEquality(i.Model, CurrentGroupedBeatmap.Group));
             if (groupItem != null)
-                HandleItemActivated(groupItem);
+                Activate(groupItem);
         }
 
         protected override double? GetScrollTarget()

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

@@ -561,6 +561,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public override Task RemovePlaylistItem(long playlistItemId) => RemoveUserPlaylistItem(api.LocalUser.Value.OnlineID, clone(playlistItemId));
 
+        public override Task VoteToSkipIntro()
+        {
+            return UserVoteToSkipIntro(api.LocalUser.Value.OnlineID);
+        }
+
+        public async Task UserVoteToSkipIntro(int userId)
+        {
+            await ((IMultiplayerClient)this).UserVotedToSkipIntro(userId).ConfigureAwait(false);
+        }
+
         protected override Task<MultiplayerRoom> CreateRoomInternal(MultiplayerRoom room)
         {
             Room apiRoom = new Room(room)

osu.Game/Users/UserRankPanel.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Users
         private const int padding = 10;
         private const int main_content_height = 80;
 
-        private ProfileValueDisplay globalRankDisplay = null!;
+        private GlobalRankDisplay globalRankDisplay = null!;
         private ProfileValueDisplay countryRankDisplay = null!;
         private LoadingLayer loadingLayer = null!;
 
@@ -71,8 +71,13 @@ namespace osu.Game.Users
             var statistics = statisticsProvider?.GetStatisticsFor(ruleset.Value);
 
             loadingLayer.State.Value = statistics == null ? Visibility.Visible : Visibility.Hidden;
-            globalRankDisplay.Content = statistics?.GlobalRank?.ToLocalisableString("\\##,##0") ?? "-";
-            countryRankDisplay.Content = statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? "-";
+
+            // TODO: implement highest rank tooltip
+            // `RankHighest` resides in `APIUser`, but `api.LocalUser` doesn't update
+            // maybe move to `UserStatistics` in api, so `UserStatisticsWatcher` can update the value
+            globalRankDisplay.UserStatistics.Value = statistics;
+
+            countryRankDisplay.Content.Text = statistics?.CountryRank?.ToLocalisableString("\\##,##0") ?? "-";
         }
 
         protected override Drawable CreateLayout()
@@ -187,13 +192,7 @@ namespace osu.Game.Users
                         {
                             new Drawable[]
                             {
-                                globalRankDisplay = new ProfileValueDisplay(true)
-                                {
-                                    Title = UsersStrings.ShowRankGlobalSimple,
-                                    // TODO: implement highest rank tooltip
-                                    // `RankHighest` resides in `APIUser`, but `api.LocalUser` doesn't update
-                                    // maybe move to `UserStatistics` in api, so `UserStatisticsWatcher` can update the value
-                                },
+                                globalRankDisplay = new GlobalRankDisplay(),
                                 countryRankDisplay = new ProfileValueDisplay(true)
                                 {
                                     Title = UsersStrings.ShowRankCountrySimple,

osu.Game/Users/UserStatistics.cs

@@ -40,6 +40,9 @@ namespace osu.Game.Users
         [JsonProperty(@"global_rank")]
         public int? GlobalRank;
 
+        [JsonProperty(@"global_rank_percent")]
+        public float? GlobalRankPercent;
+
         [JsonProperty(@"country_rank")]
         public int? CountryRank;