Merge remote-tracking branch 'upstream/master' into download-tracking-component

# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
This commit is contained in:
Dean Herbert
2019-01-23 11:06:29 +09:00
15 changed files with 203 additions and 95 deletions

View File

@ -355,11 +355,7 @@ namespace osu.Game.Online.API
State = APIState.Offline;
}
private static User createGuestUser() => new User
{
Username = @"Guest",
Id = 1,
};
private static User createGuestUser() => new GuestUser();
protected override void Dispose(bool isDisposing)
{
@ -370,6 +366,15 @@ namespace osu.Game.Online.API
}
}
internal class GuestUser : User
{
public GuestUser()
{
Username = @"Guest";
Id = 1;
}
}
public enum APIState
{
/// <summary>