Merge remote-tracking branch 'upstream/master' into Private_Messages

This commit is contained in:
Dean Herbert
2018-11-12 20:41:10 +09:00
410 changed files with 6673 additions and 3295 deletions

View File

@ -16,13 +16,10 @@ namespace osu.Game.Online.Chat
//todo: this should be inside sender.
[JsonProperty(@"sender_id")]
public int UserId;
public long UserId;
[JsonProperty(@"target_type")]
public TargetType TargetType;
[JsonProperty(@"target_id")]
public long TargetId;
[JsonProperty(@"channel_id")]
public long ChannelId;
[JsonProperty(@"is_action")]
public bool IsAction;