Merge branch 'master' into beatmap-cancellation-token

This commit is contained in:
Dean Herbert
2021-11-16 14:43:13 +09:00
206 changed files with 4647 additions and 1128 deletions

View File

@ -92,6 +92,9 @@ namespace osu.Game.Screens.Play.HUD
scoreProcessor.NewJudgement += onJudgementChanged;
scoreProcessor.JudgementReverted += onJudgementChanged;
}
if (gameplayState?.LastJudgementResult.Value != null)
onJudgementChanged(gameplayState.LastJudgementResult.Value);
}
private bool isValid;
@ -155,7 +158,10 @@ namespace osu.Game.Screens.Play.HUD
base.Dispose(isDisposing);
if (scoreProcessor != null)
{
scoreProcessor.NewJudgement -= onJudgementChanged;
scoreProcessor.JudgementReverted -= onJudgementChanged;
}
loadCancellationSource?.Cancel();
}
@ -184,7 +190,7 @@ namespace osu.Game.Screens.Play.HUD
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = OsuFont.Numeric.With(size: 16)
Font = OsuFont.Numeric.With(size: 16, fixedWidth: true)
},
new OsuSpriteText
{