sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into skin--completion

Browse Source
This commit is contained in:
Dan Balasescu
2018-03-22 16:39:08 +09:00
committed by Dean Herbert
parent fb3d319d0e 75ca10af75
commit ab9505652b
26 changed files with 139 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Skinning/Skin.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Skinning
public abstract Texture GetTexture(string componentName);
public virtual Color4? GetComboColour(IHasComboIndex comboObject) =>
public virtual Color4? GetComboColour(IHasComboInformation comboObject) =>
Configuration.ComboColours.Count == 0 ? (Color4?)null : Configuration.ComboColours[comboObject.ComboIndex % Configuration.ComboColours.Count];
protected Skin(SkinInfo skin)