Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-08-08 20:06:40 +02:00
28 changed files with 298 additions and 141 deletions

View File

@@ -155,6 +155,11 @@ struct SNeutrinoTheme
int progressbar_timescale_green;
int progressbar_timescale_yellow;
int progressbar_timescale_invert;
unsigned char shadow_alpha;
unsigned char shadow_red;
unsigned char shadow_green;
unsigned char shadow_blue;
};
struct timer_remotebox_item
@@ -945,6 +950,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)
#define SIDEBAR_WIDTH CFrameBuffer::getInstance()->scale2Res(40)
#define BIGFONT_FACTOR 1.5
struct SglobalInfo