Merge remote-tracking branch 'Joehuu/master' into drawnode-composability

# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
This commit is contained in:
smoogipoo
2019-04-08 23:01:12 +09:00
143 changed files with 1654 additions and 1127 deletions

View File

@ -176,7 +176,7 @@ namespace osu.Game.Overlays.Notifications
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.TimesCircle,
Icon = FontAwesome.Solid.TimesCircle,
Size = new Vector2(20),
}
};