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

Merge pull request #381 from peppy/general-fixes

Browse Source 
General fixes.
This commit is contained in:
Dean Herbert 2017-02-22 16:20:20 +09:00 committed by GitHub
commit 202976c0c3
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -107,7 +107,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
if (repeat > currentRepeat)
{
if (ball.Tracking)
if (repeat < slider.RepeatCount && ball.Tracking)
PlaySample();
currentRepeat = repeat;
}

5
osu.Game/Online/API/APIAccess.cs
View File

@ -196,7 +196,10 @@ namespace osu.Game.Online.API
Logger.Log($@"Performing request {req}", LoggingTarget.Network);
req.Perform(this);
State = APIState.Online;
//we could still be in initialisation, at which point we don't want to say we're Online yet.
if (LocalUser.Value != null)
State = APIState.Online;
failureCount = 0;
return true;
}

31
osu.Game/Screens/Play/Player.cs
View File

@ -240,21 +240,6 @@ namespace osu.Game.Screens.Play
});
}
protected override void LoadComplete()
{
base.LoadComplete();
Content.Delay(250);
Content.FadeIn(250);
Delay(750);
Schedule(() =>
{
sourceClock.Start();
initializeSkipButton();
});
}
private void onPass()
{
Delay(1000);
@ -290,6 +275,22 @@ namespace osu.Game.Screens.Play
Content.Alpha = 0;
dimLevel.ValueChanged += dimChanged;
Content.Delay(250);
Content.FadeIn(250);
Delay(750);
Schedule(() =>
{
sourceClock.Start();
initializeSkipButton();
});
}
protected override void OnSuspending(Screen next)
{
Content.FadeOut(350);
base.OnSuspending(next);
}
protected override bool OnExiting(Screen next)