Merge branch 'master' into catch-drawable-namespace

This commit is contained in:
Dean Herbert
2020-02-21 10:31:31 +09:00
82 changed files with 1725 additions and 732 deletions

View File

@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
case CatchSkinComponents.FruitOrange:
case CatchSkinComponents.FruitGrapes:
case CatchSkinComponents.FruitPear:
var lookupName = catchSkinComponent.Component.ToString().Underscore().Hyphenate();
var lookupName = catchSkinComponent.Component.ToString().Kebaberize();
if (GetTexture(lookupName) != null)
return new LegacyFruitPiece(lookupName);