sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ruleset-shaders

Browse Source
This commit is contained in:
Dan Balasescu
2021-07-07 15:44:30 +09:00
committed by GitHub
parent bea828a364 05c4e0254b
commit d2722f1523
351 changed files with 6955 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -489,15 +489,15 @@ namespace osu.Game.Rulesets.UI
{
get
{
foreach (var h in Objects)
foreach (var hitObject in Objects)
{
if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return h.HitWindows;
if (hitObject.HitWindows.WindowFor(HitResult.Miss) > 0)
return hitObject.HitWindows;
foreach (var n in h.NestedHitObjects)
foreach (var nested in hitObject.NestedHitObjects)
{
if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return n.HitWindows;
if (nested.HitWindows.WindowFor(HitResult.Miss) > 0)
return nested.HitWindows;
}
}

3
osu.Game/Rulesets/UI/ModIcon.cs
View File

@ -13,6 +13,7 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Rulesets.Mods;
using osuTK;
using osu.Framework.Bindables;
using osu.Framework.Localisation;
namespace osu.Game.Rulesets.UI
{
@ -29,7 +30,7 @@ namespace osu.Game.Rulesets.UI
private const float size = 80;
public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
public virtual LocalisableString TooltipText => showTooltip ? mod.IconTooltip : null;
private Mod mod;
private readonly bool showTooltip;