Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor

This commit is contained in:
EVAST9919
2017-05-04 17:35:41 +03:00
7 changed files with 436 additions and 16 deletions

View File

@ -202,8 +202,6 @@ namespace osu.Game.Rulesets.UI
protected HitRenderer(WorkingBeatmap beatmap)
: base(beatmap)
{
KeyConversionInputManager.Add(Playfield = CreatePlayfield());
InputManager.Add(content = new Container
{
RelativeSizeAxes = Axes.Both,
@ -216,6 +214,8 @@ namespace osu.Game.Rulesets.UI
[BackgroundDependencyLoader]
private void load()
{
KeyConversionInputManager.Add(Playfield = CreatePlayfield());
loadObjects();
if (InputManager?.ReplayInputHandler != null)