Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations

This commit is contained in:
Dean Herbert
2019-07-29 19:03:36 +09:00
48 changed files with 675 additions and 316 deletions

View File

@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.UpdateInitialTransforms();
ApproachCircle.FadeIn(Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
ApproachCircle.ScaleTo(1.1f, HitObject.TimePreempt);
ApproachCircle.ScaleTo(1f, HitObject.TimePreempt);
ApproachCircle.Expire(true);
}