Merge remote-tracking branch 'origin/master' into mania-mask-container

# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
This commit is contained in:
smoogipoo
2018-06-07 15:32:31 +09:00
159 changed files with 3203 additions and 1678 deletions

View File

@ -173,6 +173,9 @@ namespace osu.Game.Rulesets.Mania.UI
internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
{
if (!judgedObject.DisplayJudgement)
return;
judgements.Clear();
judgements.Add(new DrawableManiaJudgement(judgement, judgedObject)
{