Merge branch 'master' into divVerent/csqcmodel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / skin-customizables.inc

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index b93ecaa7ce84d5f4cc63dd9099c78e1963b0e3f9..e8cfba3689a7bcca7ed0fe1fa1eaffa4549dd904 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -6,7 +6,7 @@ print "\n";
 while(<DATA>)
 {
        chomp;
-       if(/^\s*(?:SKINFLOAT|SKINVECTOR)\(([A-Z_]+), ([-'0-9. ]+)\);$/)
+       if(/^\s*(?:SKINFLOAT|SKINVECTOR)\(([A-Z_]+), ([-'0-9. ]+)\);$/) #'
        {
                printf "%-31s %s\n", $1, $2;
        }
@@ -51,9 +51,11 @@ SKINBEGIN
        SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
 
        // the individual dialog background colors
+       SKINVECTOR(COLOR_DIALOG_FIRSTRUN, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_MULTIPLAYER, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_SETTINGS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_TEAMSELECT, '1 1 1');
+       SKINVECTOR(COLOR_DIALOG_SANDBOXTOOLS, '1 1 1');
        SKINVECTOR(COLOR_DIALOG_QUIT, '1 0 0');
        SKINVECTOR(COLOR_DIALOG_ADVANCED, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_MUTATORS, '0.7 0.7 1');
@@ -62,7 +64,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
        SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
-       SKINVECTOR(COLOR_DIALOG_RADAR, '0.7 0.7 1');
+       SKINVECTOR(COLOR_DIALOG_WAYPOINTS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 
@@ -101,6 +103,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_BUTTON_C, '1 1 1');
        SKINVECTOR(COLOR_BUTTON_F, '1 1 1');
        SKINVECTOR(COLOR_BUTTON_D, '1 1 1');
+       SKINFLOAT(MARGIN_BUTTON, 0.5);
 
        // item: campaign
        SKINFLOAT(ALPHA_CAMPAIGN_SELECTABLE, 0.8);
@@ -222,6 +225,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_SERVERLIST_FAVORITE, '1 1 1');
        SKINFLOAT(ALPHA_SERVERLIST_IMPOSSIBLE, 0.7);
        SKINVECTOR(COLOR_SERVERLIST_IMPOSSIBLE, '0.3 0.3 0.3');
+       SKINSTRING(GFX_SERVERLIST_ICON, "icon");
 
        // item: server info
        SKINVECTOR(COLOR_SERVERINFO_NAME, '1 1 1');