1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:07:28 +08:00

Merge remote-tracking branch 'origin/master' into performance-calculator

This commit is contained in:
smoogipoo 2017-11-21 19:55:28 +09:00
commit 6686fe9ecd
2 changed files with 1 additions and 7 deletions

@ -1 +1 @@
Subproject commit 14eb531c0056b8569f21b3571890383ffbea768e
Subproject commit 83925a84072ec9da0d008c82256294b765321c0b

View File

@ -43,12 +43,6 @@ namespace osu.Game.Screens.Select
};
}
protected override void LoadComplete()
{
base.LoadComplete();
AlwaysPresent = true;
}
protected override bool BlockPassThroughMouse => false;
protected override void PopIn()