Merge branch 'master' into restructure-spectator-client

This commit is contained in:
smoogipoo
2021-05-20 18:53:42 +09:00
20 changed files with 742 additions and 739 deletions

View File

@ -86,7 +86,7 @@ namespace osu.Game
protected IAPIProvider API;
private SpectatorClient spectatorClient;
private StatefulMultiplayerClient multiplayerClient;
private MultiplayerClient multiplayerClient;
protected MenuCursorContainer MenuCursorContainer;
@ -241,7 +241,7 @@ namespace osu.Game
dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
dependencies.CacheAs(spectatorClient = new OnlineSpectatorClient(endpoints));
dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
dependencies.CacheAs(multiplayerClient = new OnlineMultiplayerClient(endpoints));
var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);