Merge branch 'master' into sliderbody-rework

This commit is contained in:
Dean Herbert
2018-02-26 15:00:18 +09:00
committed by GitHub
24 changed files with 428 additions and 142 deletions

View File

@ -162,6 +162,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
this.FadeOut(fade_out_time, Easing.OutQuint).Expire();
}
Expire(true);
}
public Drawable ProxiedLayer => HeadCircle.ApproachCircle;