mirror of
https://github.com/ppy/osu.git
synced 2025-01-18 20:22:58 +08:00
Merge branch 'master' into polygon-tool
This commit is contained in:
commit
7248c04ba4
@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Edit
|
||||
protected readonly OsuGridToolboxGroup OsuGridToolboxGroup = new OsuGridToolboxGroup();
|
||||
|
||||
[Cached]
|
||||
protected readonly FreehandSliderToolboxGroup FreehandlSliderToolboxGroup = new FreehandSliderToolboxGroup();
|
||||
protected readonly FreehandSliderToolboxGroup FreehandSliderToolboxGroup = new FreehandSliderToolboxGroup();
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load()
|
||||
@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Edit
|
||||
ScaleHandler = (OsuSelectionScaleHandler)BlueprintContainer.SelectionHandler.ScaleHandler,
|
||||
},
|
||||
new GenerateToolboxGroup(),
|
||||
FreehandlSliderToolboxGroup
|
||||
FreehandSliderToolboxGroup
|
||||
}
|
||||
);
|
||||
}
|
||||
|
@ -208,6 +208,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
||||
|
||||
protected override async Task<MultiplayerRoom> JoinRoom(long roomId, string? password = null)
|
||||
{
|
||||
if (RoomJoined || ServerAPIRoom != null)
|
||||
throw new InvalidOperationException("Already joined a room");
|
||||
|
||||
roomId = clone(roomId);
|
||||
password = clone(password);
|
||||
|
||||
@ -260,6 +263,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
||||
protected override Task LeaveRoomInternal()
|
||||
{
|
||||
RoomJoined = false;
|
||||
ServerAPIRoom = null;
|
||||
ServerRoom = null;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user