Merge branch 'master' into fixes

This commit is contained in:
Huo Yaoyuan
2017-08-04 13:49:03 +08:00
76 changed files with 807 additions and 319 deletions

View File

@ -3,6 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Input;
using OpenTK;
using OpenTK.Input;
namespace osu.Game.Graphics.UserInterface
@ -16,13 +17,13 @@ namespace osu.Game.Graphics.UserInterface
Height = 35;
AddRange(new Drawable[]
{
new TextAwesome
new SpriteIcon
{
Icon = FontAwesome.fa_search,
Origin = Anchor.CentreRight,
Anchor = Anchor.CentreRight,
Margin = new MarginPadding { Right = 10 },
TextSize = 20
Size = new Vector2(20),
}
});