Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector

This commit is contained in:
Andrei Zavatski
2019-11-12 08:25:42 +03:00
83 changed files with 1507 additions and 599 deletions

View File

@ -436,8 +436,10 @@ namespace osu.Game.Rulesets.UI
return h.HitWindows;
foreach (var n in h.NestedHitObjects)
{
if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return n.HitWindows;
}
}
return null;

View File

@ -130,9 +130,13 @@ namespace osu.Game.Rulesets.UI
base.Update();
if (beatmap != null)
{
foreach (var mod in mods)
{
if (mod is IUpdatableByPlayfield updatable)
updatable.Update(this);
}
}
}
/// <summary>