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

@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual
public new bool IsLoaded => base.IsLoaded && MultiplayerScreen.IsLoaded;
[Cached(typeof(MultiplayerClient))]
public readonly TestMultiplayerClient Client;
public readonly TestMultiplayerClient MultiplayerClient;
[Cached(typeof(UserLookupCache))]
private readonly UserLookupCache userLookupCache = new TestUserLookupCache();
@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual
{
userLookupCache,
beatmapLookupCache,
Client = new TestMultiplayerClient(RoomManager),
MultiplayerClient = new TestMultiplayerClient(RoomManager),
screenStack = new OsuScreenStack
{
Name = nameof(TestMultiplayerComponents),