Merge origin/master

This commit is contained in:
LevelX2 2016-09-17 02:08:47 +02:00
commit b9953a5ca9
7 changed files with 263 additions and 10 deletions

View file

@ -52,7 +52,7 @@ public class GameLog {
static final String LOG_TT_COLOR_GREEN = "Green"; // LightGreen
static final String LOG_TT_COLOR_BLUE = "Blue";
static final String LOG_TT_COLOR_BLACK = "Black";
static final String LOG_TT_COLOR_WHITE = "#CCDB00";
static final String LOG_TT_COLOR_WHITE = "#FDFFE6";
static final String LOG_TT_COLOR_MULTI = "#FFAC40";
static final String LOG_TT_COLOR_COLORLESS = "#94A4BA";
static final String LOG_COLOR_NEUTRAL = "#F0F8FF"; // AliceBlue