h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-23 03:59:52 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into test-snaking

Browse Source
This commit is contained in:
Dean Herbert
2020-04-06 16:47:29 +09:00
committed by GitHub
Unverified
parent 3ff27816be 9477629a56
commit 49e082b708
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+6
View File
@@ -132,6 +132,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
return SkinUtils.As<TValue>(new BindableFloat(LEGACY_CIRCLE_RADIUS));
break;
case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
// See https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
// HitCircleOverlayAboveNumer (with typo) should still be supported for now.
return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
}
break;
osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+2 -1
View File
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
AllowSliderBallTint,
CursorExpand,
CursorRotate,
HitCircleOverlayAboveNumber
HitCircleOverlayAboveNumber,
HitCircleOverlayAboveNumer // Some old skins will have this typo
}
}