New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix beatmap combo colours not being applied #2215

Merged
merged 8 commits into from Mar 16, 2018

Conversation

2 participants
@peppy
Member

peppy commented Mar 13, 2018

BeatmapConverter wasn't transferring them due to some convoluted logic.

This also prepares to have skin.ini read for additional combo colour application in the near future.

peppy added some commits Mar 13, 2018

@peppy peppy added this to the March 2018 milestone Mar 13, 2018

if (split.Length != 3)
throw new InvalidOperationException($@"Color specified in incorrect format (should be R,G,B): {pair.Value}");
if (!byte.TryParse(split[0], out var r) || !byte.TryParse(split[1], out var g) || !byte.TryParse(split[2], out var b))

This comment has been minimized.

@smoogipoo

smoogipoo Mar 14, 2018

Contributor

shouldn't we be trimming each of these?

This comment has been minimized.

@peppy

peppy Mar 14, 2018

Member

They aren't trimmed in stable, so I think it's safe to not do so

}
}
private bool hasCustomColours;

This comment has been minimized.

@smoogipoo

smoogipoo Mar 14, 2018

Contributor

I'd rather this was named hasComboColours so as to not conflict with IHasCustomColours.

This comment has been minimized.

@peppy

peppy Mar 14, 2018

Member

oops

@smoogipoo smoogipoo changed the title from Fix baetmap combo colours not being applied to Fix beatmap combo colours not being applied Mar 14, 2018

addressed

@smoogipoo

lgtm

@smoogipoo smoogipoo merged commit 41036ab into ppy:master Mar 16, 2018

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@peppy peppy deleted the peppy:fix-combo-colours branch Mar 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment