Merge branch 'master' into approach-rate

This commit is contained in:
Shawdooow
2018-01-03 10:02:55 -05:00
committed by GitHub
49 changed files with 586 additions and 295 deletions

View File

@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Origin = Anchor.Centre;
Position = HitObject.StackedPosition;
Scale = new Vector2(HitObject.Scale);
Scale = new Vector2(h.Scale);
Children = new Drawable[]
{