1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 00:13:21 +08:00

Merge branch 'master' into ParallaxContainerImprovement

This commit is contained in:
Jacob 2018-05-22 16:32:05 +02:00 committed by GitHub
commit b328957557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -335,6 +335,9 @@ namespace osu.Game.Screens.Menu
logoDelayedAction = Scheduler.AddDelayed(() => logoDelayedAction = Scheduler.AddDelayed(() =>
{ {
hideOverlaysOnEnter.Value = true;
allowOpeningOverlays.Value = false;
logo.ClearTransforms(targetMember: nameof(Position)); logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both; logo.RelativePositionAxes = Axes.Both;
@ -362,6 +365,7 @@ namespace osu.Game.Screens.Menu
logoTracking = true; logoTracking = true;
logo.Impact(); logo.Impact();
hideOverlaysOnEnter.Value = false; hideOverlaysOnEnter.Value = false;
allowOpeningOverlays.Value = true; allowOpeningOverlays.Value = true;
}, 200); }, 200);