Merge branch 'master' into better-room-status

osu.Game/Online/Rooms/JoinRoomRequest.cs

@@ -7,7 +7,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online.Rooms
 {
-    public class JoinRoomRequest : APIRequest
+    public class JoinRoomRequest : APIRequest<Room>
     {
         public readonly Room Room;
         public readonly string? Password;

osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs

@@ -268,7 +268,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private void updateScreenModeWarning()
         {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS)
+            // Can be removed once we stop supporting SDL2.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && !FrameworkEnvironment.UseSDL3)
             {
                 if (windowModeDropdown.Current.Value == WindowMode.Fullscreen)
                     windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true);

osu.Game/Screens/Menu/MenuTip.cs

@@ -118,7 +118,6 @@ namespace osu.Game.Screens.Menu
                 "You can create mod presets to make toggling your favorite mod combinations easier!",
                 "Many mods have customisation settings that drastically change how they function. Click the Mod Customisation button in mod select to view settings!",
                 "Press Ctrl-Shift-R to switch to a random skin!",
-                "Press Ctrl-Shift-F to toggle the FPS Counter. But make sure not to pay too much attention to it!",
                 "While watching a replay, press Ctrl-H to toggle replay settings!",
                 "You can easily copy the mods from scores on a leaderboard by right-clicking on them!",
                 "Ctrl-Enter at song select will start a beatmap in autoplay mode!"

osu.Game/Screens/Menu/SongTicker.cs

@@ -8,6 +8,9 @@ using osu.Game.Graphics.Sprites;
 using osuTK;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 
@@ -27,7 +30,40 @@ namespace osu.Game.Screens.Menu
         public SongTicker()
         {
             AutoSizeAxes = Axes.Both;
-            Child = new FillFlowContainer
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Position = new Vector2(5, -5),
+                    Padding = new MarginPadding(-5),
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new CircularContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            EdgeEffect = new EdgeEffectParameters
+                            {
+                                Radius = 75,
+                                Type = EdgeEffectType.Shadow,
+                                Colour = OsuColour.Gray(0.04f).Opacity(0.3f),
+                            },
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    AlwaysPresent = true,
+                                    Alpha = 0,
+                                },
+                            }
+                        },
+                    }
+                },
+                new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
@@ -47,6 +83,7 @@ namespace osu.Game.Screens.Menu
                             Font = OsuFont.GetFont(size: 16)
                         }
                     }
+                },
             };
         }
 

osu.Game/Screens/OnlinePlay/Components/RoomManager.cs

@@ -72,9 +72,13 @@ namespace osu.Game.Screens.OnlinePlay.Components
             currentJoinRoomRequest?.Cancel();
             currentJoinRoomRequest = new JoinRoomRequest(room, password);
 
-            currentJoinRoomRequest.Success += () =>
+            currentJoinRoomRequest.Success += result =>
             {
                 joinedRoom.Value = room;
+
+                AddOrUpdateRoom(result);
+                room.CopyFrom(result); // Also copy back to the source model, since this is likely to have been stored elsewhere.
+
                 onSuccess?.Invoke(room);
             };
 

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs

@@ -438,7 +438,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 => MaxParticipantsField.Text = room.MaxParticipants?.ToString();
 
             private void updateRoomAutoStartDuration()
-                => typeLabel.Text = room.AutoStartDuration.GetLocalisableDescription();
+                => startModeDropdown.Current.Value = (StartMode)room.AutoStartDuration.TotalSeconds;
 
             private void updateRoomPlaylist()
                 => drawablePlaylist.Items.ReplaceRange(0, drawablePlaylist.Items.Count, room.Playlist);

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

@@ -299,7 +299,13 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     case GlobalAction.Back:
                         if (!pendingAnimation)
+                        {
+                            if (IsDangerousAction)
+                                BeginConfirm();
+                            else
                                 Confirm();
+                        }
+
                         return true;
 
                     case GlobalAction.PauseGameplay:
@@ -307,7 +313,13 @@ namespace osu.Game.Screens.Play.HUD
                         if (ReplayLoaded.Value) return false;
 
                         if (!pendingAnimation)
+                        {
+                            if (IsDangerousAction)
+                                BeginConfirm();
+                            else
                                 Confirm();
+                        }
+
                         return true;
                 }
 

osu.Game/Screens/Play/Player.cs

@@ -976,6 +976,8 @@ namespace osu.Game.Screens.Play
                 if (PauseOverlay.State.Value == Visibility.Visible)
                     PauseOverlay.Hide();
 
+                bool restartOnFail = GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail);
+                if (!restartOnFail)
                     failAnimationContainer.Start();
 
                 // Failures can be triggered either by a judgement, or by a mod.
@@ -990,7 +992,7 @@ namespace osu.Game.Screens.Play
                     ScoreProcessor.FailScore(Score.ScoreInfo);
                     OnFail();
 
-                    if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
+                    if (restartOnFail)
                         Restart(true);
                 });
             }

osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs

@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
                         return true;
                     }
 
-                    joinRoomRequest.TriggerSuccess();
+                    joinRoomRequest.TriggerSuccess(createResponseRoom(room, true));
                     return true;
                 }