Merge remote-tracking branch 'upstream/master' into catch-combo-counter

This commit is contained in:
Salman Ahmed
2020-08-29 23:23:36 +03:00
parent ba8a4eb6f0
commit a0a4501008
65 changed files with 1352 additions and 309 deletions

View File

@ -104,10 +104,6 @@ namespace osu.Game.Beatmaps.Formats
try
{
byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
if (alpha == 0)
alpha = 255;
colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
}
catch