h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 14:25:05 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-replay-time-stop

Browse Source
This commit is contained in:
Dan Balasescu 2018-02-01 20:08:58 +09:00 committed by GitHub
commit c486609174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 90bf49a2df3dbad5994d922df63e4891c622dbc3
Subproject commit d89e6cd63140c2b73631b79ff83b130a2b9958ed

2
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -140,6 +140,8 @@ namespace osu.Game.Rulesets.UI
if (!base.UpdateSubTree())
return false;
UpdateSubTreeMasking(ScreenSpaceDrawQuad.AABBFloat);
if (isAttached)
{
// When handling replay input, we need to consider the possibility of fast-forwarding, which may cause the clock to be updated