h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-23 22:53:04 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into multiplayer-remove-expired-item-removal

Browse Source
This commit is contained in:
Salman Alshamrani 2024-11-23 22:19:21 -05:00 committed by GitHub
commit 956da0383f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Rooms/JoinRoomRequest.cs
View File

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

3
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -268,7 +268,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
private void updateScreenModeWarning() 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) if (windowModeDropdown.Current.Value == WindowMode.Fullscreen)
windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true); windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true);

39
osu.Game/Screens/Menu/SongTicker.cs
View File

@ -8,6 +8,9 @@ using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Bindables; 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.Framework.Localisation;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
@ -27,7 +30,40 @@ namespace osu.Game.Screens.Menu
public SongTicker() public SongTicker()
{ {
AutoSizeAxes = Axes.Both; 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, AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
@ -47,6 +83,7 @@ namespace osu.Game.Screens.Menu
Font = OsuFont.GetFont(size: 16) Font = OsuFont.GetFont(size: 16)
} }
} }
},
}; };
} }

6
osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
View File

@ -72,9 +72,13 @@ namespace osu.Game.Screens.OnlinePlay.Components
currentJoinRoomRequest?.Cancel(); currentJoinRoomRequest?.Cancel();
currentJoinRoomRequest = new JoinRoomRequest(room, password); currentJoinRoomRequest = new JoinRoomRequest(room, password);
currentJoinRoomRequest.Success += () => currentJoinRoomRequest.Success += result =>
{ {
joinedRoom.Value = room; 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); onSuccess?.Invoke(room);
}; };

2
osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
View File

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