Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options

This commit is contained in:
EVAST9919
2017-05-18 18:26:38 +03:00
8 changed files with 265 additions and 153 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");
}
}