Merge branch 'master' into rankings-tables

This commit is contained in:
Dean Herbert
2019-11-27 23:26:54 +09:00
committed by GitHub
286 changed files with 2784 additions and 1272 deletions

View File

@ -31,6 +31,12 @@ namespace osu.Game.Users.Drawables
set => base.CornerRadius = value;
}
public new float CornerExponent
{
get => base.CornerExponent;
set => base.CornerExponent = value;
}
public new EdgeEffectParameters EdgeEffect
{
get => base.EdgeEffect;

View File

@ -129,7 +129,7 @@ namespace osu.Game.Users
[JsonProperty]
private string[] playstyle
{
set { PlayStyles = value?.Select(str => Enum.Parse(typeof(PlayStyle), str, true)).Cast<PlayStyle>().ToArray(); }
set => PlayStyles = value?.Select(str => Enum.Parse(typeof(PlayStyle), str, true)).Cast<PlayStyle>().ToArray();
}
public PlayStyle[] PlayStyles;