Merge remote-tracking branch 'upstream/master' into is-alive

This commit is contained in:
Dean Herbert 2017-08-16 12:11:32 +09:00
commit 2c7f0629ef

View File

@ -227,9 +227,9 @@ namespace osu.Game.Screens.Play
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Children = new[] Children = new[]
{ {
new SpriteIcon { Icon = FontAwesome.fa_chevron_right }, new SpriteIcon { Size = new Vector2(15), Shadow = true, Icon = FontAwesome.fa_chevron_right },
new SpriteIcon { Icon = FontAwesome.fa_chevron_right }, new SpriteIcon { Size = new Vector2(15), Shadow = true, Icon = FontAwesome.fa_chevron_right },
new SpriteIcon { Icon = FontAwesome.fa_chevron_right }, new SpriteIcon { Size = new Vector2(15), Shadow = true, Icon = FontAwesome.fa_chevron_right },
} }
}, },
new OsuSpriteText new OsuSpriteText