Merge branch 'master' into replay

This commit is contained in:
Dan Balasescu
2017-03-07 11:41:16 +09:00
committed by GitHub
18 changed files with 137 additions and 49 deletions

View File

@ -34,6 +34,7 @@ namespace osu.Game.Beatmaps.Drawables
new TextAwesome
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = Size.X,
Colour = getColour(beatmap),
Icon = FontAwesome.fa_circle
@ -41,6 +42,7 @@ namespace osu.Game.Beatmaps.Drawables
new TextAwesome
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = Size.X,
Colour = Color4.White,
Icon = Ruleset.GetRuleset(beatmap.Mode).Icon