Merge remote-tracking branch 'upstream/master' into general-fixes

# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
This commit is contained in:
Dean Herbert
2017-03-14 16:15:26 +09:00
34 changed files with 182 additions and 111 deletions

View File

@ -13,7 +13,7 @@ namespace osu.Game.Modes.Osu.UI
{
public class OsuHitRenderer : HitRenderer<OsuHitObject>
{
public OsuHitRenderer(Beatmap beatmap)
public OsuHitRenderer(WorkingBeatmap beatmap)
: base(beatmap)
{
}