Merge branch 'master' into terencehill/menu_dialogs_cleanups

[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 afea3e752fd871c079df07fd8cc013995297894c..ca8f4cf8e959ee7d2a5755e74e82def02d543c0b 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,6 +51,7 @@ 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');
@@ -62,7 +63,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 +102,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);