Merge remote-tracking branch 'upstream/master' into scoredatabase

This commit is contained in:
Dean Herbert
2018-11-30 17:20:23 +09:00
12 changed files with 575 additions and 92 deletions

View File

@ -13,16 +13,20 @@ namespace osu.Game.Skinning
public string Name { get; set; }
public string Hash { get; set; }
public string Creator { get; set; }
public List<SkinFileInfo> Files { get; set; }
public bool DeletePending { get; set; }
public string FullName => $"\"{Name}\" by {Creator}";
public static SkinInfo Default { get; } = new SkinInfo { Name = "osu!lazer", Creator = "team osu!" };
public bool Equals(SkinInfo other) => other != null && ID == other.ID;
public override string ToString() => $"\"{Name}\" by {Creator}";
public override string ToString() => FullName;
}
}