h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 13:33:03 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-hold-for-menu-icon

Browse Source
This commit is contained in:
Dan Balasescu 2019-04-22 18:57:43 +09:00 committed by GitHub
commit 8fc0bf24c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/UI/Playfield.cs
View File

@ -68,7 +68,12 @@ namespace osu.Game.Rulesets.UI
{ {
Cursor = CreateCursor(); Cursor = CreateCursor();
if (Cursor != null) if (Cursor != null)
{
// initial showing of the cursor will be handed by MenuCursorContainer (via DrawableRuleset's IProvideCursor implementation).
Cursor.Hide();
AddInternal(Cursor); AddInternal(Cursor);
}
} }
/// <summary> /// <summary>

9
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -110,11 +110,8 @@ namespace osu.Game.Screens.Play
adjustableClock.ChangeSource(sourceClock); adjustableClock.ChangeSource(sourceClock);
updateRate(); updateRate();
this.Delay(750).Schedule(() => if (!IsPaused.Value)
{ Start();
if (!IsPaused.Value)
Start();
});
}); });
}); });
} }
@ -123,7 +120,7 @@ namespace osu.Game.Screens.Play
{ {
// Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
// This accounts for the audio clock source potentially taking time to enter a completely stopped state // This accounts for the audio clock source potentially taking time to enter a completely stopped state
adjustableClock.Seek(adjustableClock.CurrentTime); Seek(GameplayClock.CurrentTime);
adjustableClock.Start(); adjustableClock.Start();
IsPaused.Value = false; IsPaused.Value = false;
} }