1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-18 06:27:18 +08:00

Merge branch 'master' into fix-async-score-imports

This commit is contained in:
Dean Herbert 2019-08-08 23:34:31 +09:00 committed by GitHub
commit c02d83e72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

View File

@ -8,7 +8,7 @@ namespace osu.Game.Online.Chat
public ErrorMessage(string message)
: base(message)
{
Sender.Colour = @"ff0000";
// todo: this should likely be styled differently in the future.
}
}
}

View File

@ -313,6 +313,9 @@ namespace osu.Game.Rulesets.Scoring
/// <summary>
/// Applies the score change of a <see cref="JudgementResult"/> to this <see cref="ScoreProcessor"/>.
/// </summary>
/// <remarks>
/// Any changes applied via this method can be reverted via <see cref="RevertResult"/>.
/// </remarks>
/// <param name="result">The <see cref="JudgementResult"/> to apply.</param>
protected virtual void ApplyResult(JudgementResult result)
{
@ -357,7 +360,7 @@ namespace osu.Game.Rulesets.Scoring
}
/// <summary>
/// Reverts the score change of a <see cref="JudgementResult"/> that was applied to this <see cref="ScoreProcessor"/>.
/// Reverts the score change of a <see cref="JudgementResult"/> that was applied to this <see cref="ScoreProcessor"/> via <see cref="ApplyResult"/>.
/// </summary>
/// <param name="result">The judgement scoring result.</param>
protected virtual void RevertResult(JudgementResult result)

View File

@ -187,6 +187,7 @@ namespace osu.Game.Users
public static readonly User SYSTEM_USER = new User
{
Username = "system",
Colour = @"9c0101",
Id = 0
};