sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dean Herbert
2019-08-08 23:34:31 +09:00
committed by GitHub
parent 3ebfa0505c f6208db972
commit c02d83e72a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Chat/ErrorMessage.cs
View File

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

5
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -313,6 +313,9 @@ namespace osu.Game.Rulesets.Scoring
/// <summary> /// <summary>
/// Applies the score change of a <see cref="JudgementResult"/> to this <see cref="ScoreProcessor"/>. /// Applies the score change of a <see cref="JudgementResult"/> to this <see cref="ScoreProcessor"/>.
/// </summary> /// </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> /// <param name="result">The <see cref="JudgementResult"/> to apply.</param>
protected virtual void ApplyResult(JudgementResult result) protected virtual void ApplyResult(JudgementResult result)
{ {
@ -357,7 +360,7 @@ namespace osu.Game.Rulesets.Scoring
} }
/// <summary> /// <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> /// </summary>
/// <param name="result">The judgement scoring result.</param> /// <param name="result">The judgement scoring result.</param>
protected virtual void RevertResult(JudgementResult result) protected virtual void RevertResult(JudgementResult result)

1
osu.Game/Users/User.cs
View File

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