Merge branch 'master' into namespace-cleanup

This commit is contained in:
Dean Herbert
2018-05-15 18:10:48 +09:00
committed by GitHub
23 changed files with 184 additions and 47 deletions

View File

@ -47,6 +47,8 @@ namespace osu.Game.Rulesets.Catch.Objects
Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5;
}
protected override HitWindows CreateHitWindows() => null;
}
public enum FruitVisualRepresentation