Merge branch 'master' into remove-playlistitem-beatmap

This commit is contained in:
Dean Herbert
2022-02-16 14:24:57 +09:00
61 changed files with 720 additions and 443 deletions

View File

@ -17,13 +17,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
public const int PLAYER_1_ID = 55;
public const int PLAYER_2_ID = 56;
public TestMultiplayerClient Client => OnlinePlayDependencies.Client;
public TestMultiplayerClient MultiplayerClient => OnlinePlayDependencies.MultiplayerClient;
public new TestMultiplayerRoomManager RoomManager => OnlinePlayDependencies.RoomManager;
public TestSpectatorClient SpectatorClient => OnlinePlayDependencies?.SpectatorClient;
protected new MultiplayerTestSceneDependencies OnlinePlayDependencies => (MultiplayerTestSceneDependencies)base.OnlinePlayDependencies;
public bool RoomJoined => Client.RoomJoined;
public bool RoomJoined => MultiplayerClient.RoomJoined;
private readonly bool joinRoom;