1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:57:38 +08:00

Merge branch 'master' into patch-2

This commit is contained in:
Dean Herbert 2017-12-30 18:21:49 +09:00 committed by GitHub
commit 8efd552387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,19 +24,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
this.repeatPoint = repeatPoint; this.repeatPoint = repeatPoint;
this.drawableSlider = drawableSlider; this.drawableSlider = drawableSlider;
AutoSizeAxes = Axes.Both; Size = new Vector2(32 * repeatPoint.Scale);
Blending = BlendingMode.Additive; Blending = BlendingMode.Additive;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Scale = new Vector2(0.5f);
Children = new Drawable[] Children = new Drawable[]
{ {
new SpriteIcon new SpriteIcon
{ {
Icon = FontAwesome.fa_eercast, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Icon = FontAwesome.fa_eercast
Origin = Anchor.Centre,
Size = new Vector2(32),
} }
}; };
} }