Merge branch 'master' into skin-scaling-modes

This commit is contained in:
Dean Herbert
2019-07-24 18:37:31 +09:00
committed by GitHub
56 changed files with 656 additions and 408 deletions

View File

@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
}
protected override void UpdatePreemptState()
protected override void UpdateInitialTransforms()
{
animDuration = Math.Min(150, repeatPoint.SpanDuration / 2);
@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
);
}
protected override void UpdateCurrentState(ArmedState state)
protected override void UpdateStateTransforms(ArmedState state)
{
switch (state)
{