sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video

Browse Source
This commit is contained in:
Andrei Zavatski
2019-09-13 13:39:58 +03:00
parent 94512fea8e e1ed5dfa7d
commit 437e121056
293 changed files with 4485 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Screens/Play/Player.cs
View File

@ -180,6 +180,7 @@ namespace osu.Game.Screens.Play
},
// display the cursor above some HUD elements.
DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
HUDOverlay = new HUDOverlay(ScoreProcessor, DrawableRuleset, Mods.Value)
{
HoldToQuit =
@ -503,15 +504,18 @@ namespace osu.Game.Screens.Play
return true;
}
if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
// still want to block if we are within the cooldown period and not already paused.
return true;
if (HasFailed && ValidForResume && !FailOverlay.IsPresent)
// ValidForResume is false when restarting
// ValidForResume is false when restarting
if (ValidForResume)
{
failAnimation.FinishTransforms(true);
return true;
if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
// still want to block if we are within the cooldown period and not already paused.
return true;
if (HasFailed && !FailOverlay.IsPresent)
{
failAnimation.FinishTransforms(true);
return true;
}
}
GameplayClockContainer.ResetLocalAdjustments();