Merge remote-tracking branch 'origin/samual/serverlist'

[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 5449cd916bd7aa09b53e297f09b557cd8ccf0d4f..6b5cac042ca970af7df0cc83c1c4e9f5e5e14585 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -65,6 +65,9 @@ SKINBEGIN
        SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_VIEW, '1 0.7 0.7');
+       SKINVECTOR(COLOR_DIALOG_MODEL, '1 0.7 0.7');
+       SKINVECTOR(COLOR_DIALOG_CROSSHAIR, '1 0.7 0.7');
+       SKINVECTOR(COLOR_DIALOG_HUD, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
        SKINVECTOR(COLOR_DIALOG_HUDCONFIRM, '1 0 0');
@@ -143,8 +146,8 @@ SKINBEGIN
        SKINFLOAT(ALPHA_CVARLIST_SAVED, 1);
        SKINFLOAT(ALPHA_CVARLIST_TEMPORARY, 0.7);
        SKINVECTOR(COLOR_CVARLIST_CHANGED, '1 1 0.4');
-       SKINVECTOR(COLOR_CVARLIST_REVERTBUTTON, '1 0 0');
        SKINVECTOR(COLOR_CVARLIST_UNCHANGED, '1 1 1');
+       SKINVECTOR(COLOR_CVARLIST_CONTROLS, '1 0 0');
 
        // item: dialog
        SKINSTRING(GFX_DIALOGBORDER, "border");
@@ -163,6 +166,13 @@ SKINBEGIN
        SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1');
        SKINFLOAT(MARGIN_INPUTBOX_CHARS, 1);
 
+       // item: clear button
+       SKINSTRING(GFX_CLEARBUTTON, "clearbutton");
+       SKINFLOAT(OFFSET_CLEARBUTTON, 0);
+       SKINVECTOR(COLOR_CLEARBUTTON_N, '1 1 1');
+       SKINVECTOR(COLOR_CLEARBUTTON_F, '1 1 1');
+       SKINVECTOR(COLOR_CLEARBUTTON_C, '1 1 1');
+
        // item: key grabber
        SKINVECTOR(COLOR_KEYGRABBER_TITLES, '1 1 1');
        SKINFLOAT(ALPHA_KEYGRABBER_TITLES, 1);
@@ -187,6 +197,7 @@ SKINBEGIN
 
        // item: nexposee
        SKINVECTOR(ALPHAS_MAINMENU, '0.6 0.8 0.9');
+       SKINFLOAT(ALPHA_DIALOG_SANDBOXTOOLS, 0.6);
 
        // item: player color button
        SKINSTRING(GFX_COLORBUTTON, "colorbutton");
@@ -227,6 +238,7 @@ SKINBEGIN
        SKINFLOAT(ALPHA_SERVERLIST_IMPOSSIBLE, 0.7);
        SKINVECTOR(COLOR_SERVERLIST_IMPOSSIBLE, '0.3 0.3 0.3');
        SKINSTRING(GFX_SERVERLIST_ICON, "icon");
+       SKINFLOAT(ALPHA_SERVERLIST_ICON_NONPURE, 0.5);
 
        // item: server info
        SKINVECTOR(COLOR_SERVERINFO_NAME, '1 1 1');