Merge branch 'master' into fixes

This commit is contained in:
Huo Yaoyuan
2017-08-04 13:49:03 +08:00
76 changed files with 807 additions and 319 deletions

View File

@ -13,6 +13,7 @@ using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Osu.Scoring;
using osu.Game.Rulesets.Scoring;
using osu.Game.Overlays.Settings;
@ -106,7 +107,7 @@ namespace osu.Game.Rulesets.Osu
public override Mod GetAutoplayMod() => new OsuModAutoplay();
public override FontAwesome Icon => FontAwesome.fa_osu_osu_o;
public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_osu_o };
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap);