Merge branch 'master' of ppy/osu into beat-syncing

This commit is contained in:
ColdVolcano
2017-05-20 11:46:51 -05:00
75 changed files with 1660 additions and 785 deletions

View File

@ -87,5 +87,8 @@ namespace osu.Game.Graphics
public readonly Color4 RedDarker = FromHex(@"870000");
public readonly Color4 ChatBlue = FromHex(@"17292e");
public readonly Color4 SpinnerBase = FromHex(@"002c3c");
public readonly Color4 SpinnerFill = FromHex(@"005b7c");
}
}