Merge branch 'master' into multi-queueing-modes

This commit is contained in:
smoogipoo
2021-11-08 19:19:50 +09:00
288 changed files with 2214 additions and 1694 deletions

View File

@ -19,7 +19,7 @@ using osu.Game.Online.Multiplayer.MatchTypes.TeamVersus;
using osu.Game.Online.Multiplayer.Queueing;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Mods;
using osu.Game.Users;
using APIUser = osu.Game.Online.API.Requests.Responses.APIUser;
namespace osu.Game.Tests.Visual.Multiplayer
{
@ -52,7 +52,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
public void Disconnect() => isConnected.Value = false;
public MultiplayerRoomUser AddUser(User user, bool markAsPlaying = false)
public MultiplayerRoomUser AddUser(APIUser user, bool markAsPlaying = false)
{
var roomUser = new MultiplayerRoomUser(user.Id) { User = user };
@ -74,7 +74,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
Scheduler.Update();
}
public void RemoveUser(User user)
public void RemoveUser(APIUser user)
{
Debug.Assert(Room != null);
((IMultiplayerClient)this).UserLeft(new MultiplayerRoomUser(user.Id));