Merge branch 'master' into terencehill/clear_button

[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 e8cfba3689a7bcca7ed0fe1fa1eaffa4549dd904..2afc1d9b25706e0b29171deb5ed33a0d48696257 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -64,9 +64,13 @@ 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_WAYPOINTS, '0.7 0.7 1');
+       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');
 
        // nexposee positions of windows (they are the scale transformation
        // centers, NOT the actual positions of the windows!)
@@ -142,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");
@@ -160,6 +164,8 @@ SKINBEGIN
        SKINSTRING(GFX_INPUTBOX, "inputbox");
        SKINVECTOR(COLOR_INPUTBOX_N, '1 1 1');
        SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1');
+       SKINSTRING(GFX_CLEARBUTTON, "clearbutton");
+       SKINFLOAT(OFFSET_CLEARBUTTON, 0);
        SKINFLOAT(MARGIN_INPUTBOX_CHARS, 1);
 
        // item: key grabber