Merge branch 'master'

This commit is contained in:
Huo Yaoyuan
2016-11-03 20:34:58 +08:00
61 changed files with 340 additions and 197 deletions

View File

@ -44,7 +44,7 @@ namespace osu.Game.Overlays
Position = new Vector2(10, 50);
}
public override void Load(BaseGame game)
protected override void Load(BaseGame game)
{
base.Load(game);
var osuGame = game as OsuGameBase;