Merge branch 'master' into osu-direct

This commit is contained in:
Dean Herbert
2017-05-23 17:33:20 +09:00
committed by GitHub
52 changed files with 1661 additions and 352 deletions

View File

@ -150,7 +150,7 @@ namespace osu.Game.Screens.Play
FramedClock = offsetClock,
OnRetry = Restart,
OnQuit = Exit,
CheckCanPause = () => ValidForResume && !HasFailed,
CheckCanPause = () => ValidForResume && !HasFailed && !HitRenderer.HasReplayLoaded,
Retries = RestartCount,
OnPause = () => {
hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused;