Merge branch 'beatmap_conversion' into mod_application

Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
This commit is contained in:
smoogipooo
2017-03-12 22:20:52 +09:00
5 changed files with 0 additions and 26 deletions

View File

@ -3,7 +3,6 @@
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Mania.Beatmaps;
using osu.Game.Modes.Mania.Mods;
using osu.Game.Modes.Mania.UI;
using osu.Game.Modes.Mods;
@ -109,10 +108,5 @@ namespace osu.Game.Modes.Mania
public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<T>)new ManiaBeatmapConverter();
}
}
}