Merge remote-tracking branch 'upstream/master' into options-refactor

# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
This commit is contained in:
Dean Herbert
2017-02-03 13:16:07 +09:00
28 changed files with 1140 additions and 487 deletions

View File

@ -69,12 +69,6 @@ namespace osu.Game.Beatmaps.Drawables
};
}
protected override void LoadComplete()
{
base.LoadComplete();
FadeInFromZero(250);
}
protected override void Selected()
{
base.Selected();