Merge branch 'master' into beatmap_parsing

This commit is contained in:
Dean Herbert
2017-03-14 17:50:00 +09:00
committed by GitHub
9 changed files with 106 additions and 53 deletions

View File

@ -7,6 +7,7 @@ using osu.Game.Modes.Osu.Beatmaps;
using osu.Game.Modes.Osu.Objects;
using osu.Game.Modes.Osu.Objects.Drawables;
using osu.Game.Modes.UI;
using osu.Game.Screens.Play;
namespace osu.Game.Modes.Osu.UI
{
@ -23,6 +24,8 @@ namespace osu.Game.Modes.Osu.UI
protected override Playfield<OsuHitObject> CreatePlayfield() => new OsuPlayfield();
protected override KeyConversionInputManager CreateKeyConversionInputManager() => new OsuKeyConversionInputManager();
protected override DrawableHitObject<OsuHitObject> GetVisualRepresentation(OsuHitObject h)
{
var circle = h as HitCircle;