Merge branch 'master' into controls

This commit is contained in:
Huo Yaoyuan
2017-03-22 08:54:03 +08:00
53 changed files with 1390 additions and 181 deletions

View File

@ -54,6 +54,7 @@ namespace osu.Game.Graphics.UserInterface
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Margin = new MarginPadding { Right = 4 },
TextSize = 20
}
};
}