Merge remote-tracking branch 'upstream/master' into replay

# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
This commit is contained in:
Dean Herbert
2017-03-04 13:17:01 +09:00
126 changed files with 5024 additions and 280 deletions

View File

@ -9,6 +9,7 @@ using System.Collections.Concurrent;
using osu.Framework.Input;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Overlays.Mods;
namespace osu.Game.Modes
{
@ -27,6 +28,8 @@ namespace osu.Game.Modes
public virtual IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new BeatmapStatistic[] { };
public abstract IEnumerable<Mod> GetModsFor(ModType type);
public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount);
public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap, InputManager input = null);