Merge branch 'master' into correctQuickFade

This commit is contained in:
Dean Herbert
2018-07-17 00:02:15 +09:00
committed by GitHub
97 changed files with 1234 additions and 684 deletions

View File

@ -169,7 +169,7 @@ namespace osu.Game.Screens.Play
OnPause = () =>
{
pauseContainer.Retries = RestartCount;
hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused;
hudOverlay.KeyCounter.IsCounting = !pauseContainer.IsPaused;
},
OnResume = () => hudOverlay.KeyCounter.IsCounting = true,
Children = new[]