Merge branch 'master' into previous-usernames

This commit is contained in:
Dan Balasescu
2019-08-13 14:21:44 +09:00
committed by GitHub
118 changed files with 2652 additions and 1010 deletions

View File

@ -162,7 +162,10 @@ namespace osu.Game.Users
}
[JsonProperty(@"rankHistory")]
public RankHistoryData RankHistory;
private RankHistoryData rankHistory
{
set => Statistics.RankHistory = value;
}
[JsonProperty("badges")]
public Badge[] Badges;
@ -187,6 +190,7 @@ namespace osu.Game.Users
public static readonly User SYSTEM_USER = new User
{
Username = "system",
Colour = @"9c0101",
Id = 0
};