Merge branch 'master'

Conflicts:
	osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
This commit is contained in:
Dean Herbert
2019-09-05 14:40:30 +09:00
18 changed files with 293 additions and 35 deletions

View File

@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Tests
{
switch (component.LookupName)
{
case "Gameplay/Catch/fruit-catcher-idle":
case "Gameplay/catch/fruit-catcher-idle":
return new CatcherCustomSkin();
}