1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00

Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays

This commit is contained in:
Dean Herbert 2019-10-04 11:05:28 +08:00 committed by GitHub
commit a7d7a28d34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,10 +14,10 @@ namespace osu.Game.Skinning
{ {
ComboColours.AddRange(new[] ComboColours.AddRange(new[]
{ {
new Color4(17, 136, 170, 255), new Color4(255, 192, 0, 255),
new Color4(102, 136, 0, 255), new Color4(0, 202, 0, 255),
new Color4(204, 102, 0, 255), new Color4(18, 124, 255, 255),
new Color4(121, 9, 13, 255) new Color4(242, 24, 57, 255),
}); });
} }
} }