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

Merge branch 'master' into fix-skip-button

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

2
osu-framework

@ -1 +1 @@
Subproject commit d89e6cd63140c2b73631b79ff83b130a2b9958ed Subproject commit a584706f1303f54cd7f5472240e95b70920ce079

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

@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.UI
if (!base.UpdateSubTree()) if (!base.UpdateSubTree())
return false; return false;
UpdateSubTreeMasking(ScreenSpaceDrawQuad.AABBFloat); UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
if (isAttached) if (isAttached)
{ {