X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fskin-customizables.inc;h=54f6283b80bb9033a2883d106bd46aabc61781f5;hb=14aef0c52085bf8fce7b76b10d8862aabc43c6e4;hp=4c0a08a8c57641112d9bdde34ca50a31c259484f;hpb=cd1ccb7c3ac08760ccc361d6c863fcc2ade4ac2e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index 4c0a08a8c..54f6283b8 100644
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -1,4 +1,4 @@
-#if 0
+/*
 "Perl code to convert this to a skinvalues.txt file.";
 print "title Generic\n";
 print "author Morphed\n";
@@ -32,7 +32,7 @@ while(<DATA>)
 	}
 }
 __DATA__
-#endif
+*/
 SKINBEGIN
 	// font sizes (used for everything)
 	SKINFLOAT(FONTSIZE_NORMAL, 12);
@@ -45,10 +45,11 @@ SKINBEGIN
 	SKINSTRING(GFX_TOOLTIP, "tooltip");
 	SKINVECTOR(MARGIN_TOOLTIP, '5 5 0');
 	SKINVECTOR(BORDER_TOOLTIP, '1 1 0');
+	SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+	SKINFLOAT(WIDTH_TOOLTIP, 0.3);
 	SKINFLOAT(FONTSIZE_TOOLTIP, 12);
 	SKINFLOAT(ALPHA_TOOLTIP, 0.7);
-	SKINFLOAT(WIDTH_TOOLTIP, 0.3);
-	SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+	SKINVECTOR(COLOR_TOOLTIP, '1 1 1');
 
 	// the individual dialog background colors
 	SKINVECTOR(COLOR_DIALOG_FIRSTRUN, '0.7 0.7 1');
@@ -98,6 +99,9 @@ SKINBEGIN
 	SKINFLOAT(ALPHA_DISABLED, 0.2);
 	SKINFLOAT(ALPHA_BEHIND, 0.5);
 	SKINFLOAT(ALPHA_TEXT, 0.7);
+	SKINVECTOR(COLOR_TEXT, '1 1 1');
+	SKINFLOAT(ALPHA_HEADER, 0.5);
+	SKINVECTOR(COLOR_HEADER, '1 1 1');
 
 	// item: button
 	SKINSTRING(GFX_BUTTON, "button");
@@ -140,9 +144,6 @@ SKINBEGIN
 	SKINFLOAT(ROWS_CREDITS, 20);
 	SKINFLOAT(WIDTH_CREDITS, 0.5);
 
-	// item: crosshair button
-	SKINSTRING(GFX_CROSSHAIRBUTTON, "crosshairbutton");
-
 	// item: cvar list
 	SKINFLOAT(ALPHA_CVARLIST_SAVED, 1);
 	SKINFLOAT(ALPHA_CVARLIST_TEMPORARY, 0.7);
@@ -174,6 +175,9 @@ SKINBEGIN
 	SKINVECTOR(COLOR_CLEARBUTTON_F, '1 1 1');
 	SKINVECTOR(COLOR_CLEARBUTTON_C, '1 1 1');
 
+	// item: gametype list
+	SKINFLOAT(BOOL_GAMETYPELIST_ICON_BLUR, 1);
+
 	// item: key grabber
 	SKINVECTOR(COLOR_KEYGRABBER_TITLES, '1 1 1');
 	SKINFLOAT(ALPHA_KEYGRABBER_TITLES, 1);
@@ -187,6 +191,9 @@ SKINBEGIN
 	SKINFLOAT(ALPHA_LISTBOX_WAITING, 0.5);
 	SKINVECTOR(COLOR_LISTBOX_BACKGROUND, '0 0 0');
 	SKINFLOAT(ALPHA_LISTBOX_BACKGROUND, 0.5);
+	SKINVECTOR(COLOR_LISTBOX_FOCUSED, '0 0 1');
+	SKINFLOAT(ALPHA_LISTBOX_FOCUSED, 0.7);
+	SKINFLOAT(FADEALPHA_LISTBOX_FOCUSED, 0.3);
 
 	// item: map list
 	SKINVECTOR(COLOR_MAPLIST_TITLE, '1 1 1');
@@ -202,15 +209,18 @@ SKINBEGIN
 
 	// item: player color button
 	SKINSTRING(GFX_COLORBUTTON, "colorbutton");
-	SKINSTRING(GFX_COLORBUTTON_COLOR, "color");
 
 	// item: player model
 	SKINVECTOR(COLOR_MODELTITLE, '1 1 1');
 	SKINFLOAT(ALPHA_MODELTITLE, 1);
 
-	// item: player name editor
-	SKINSTRING(GFX_CHARMAP, "charmap");
-	SKINSTRING(GFX_CHARMAP_SELECTED, "charmapbutton");
+	// item: special character picker
+	SKINVECTOR(COLOR_CHARMAP_CHAR, '1 1 1');
+	SKINFLOAT(ALPHA_CHARMAP_CHAR, 1);
+
+	// item: crosshair picker
+	SKINVECTOR(COLOR_CROSSHAIRPICKER_CROSSHAIR, '1 1 1');
+	SKINFLOAT(ALPHA_CROSSHAIRPICKER_CROSSHAIR, 1);
 
 	// item: radio button
 	SKINSTRING(GFX_RADIOBUTTON, "radiobutton");
@@ -228,6 +238,8 @@ SKINBEGIN
 	SKINFLOAT(WIDTH_SCROLLBAR, 16);
 
 	// item: server list
+	SKINFLOAT(ALPHA_SERVERLIST_CATEGORY, 0.7);
+	SKINVECTOR(COLOR_SERVERLIST_CATEGORY, '1 1 1');
 	SKINFLOAT(ALPHA_SERVERLIST_FULL, 0.4);
 	SKINFLOAT(ALPHA_SERVERLIST_EMPTY, 0.7);
 	SKINVECTOR(COLOR_SERVERLIST_LOWPING, '0 1 0');
@@ -238,7 +250,6 @@ 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");
 	SKINFLOAT(ALPHA_SERVERLIST_ICON_NONPURE, 0.5);
 
 	// item: server info
@@ -249,6 +260,12 @@ SKINBEGIN
 	SKINVECTOR(COLOR_SKINLIST_TITLE, '1 1 1');
 	SKINVECTOR(COLOR_SKINLIST_AUTHOR, '0.4 0.4 0.7');
 
+	// item: demo list
+	SKINVECTOR(COLOR_DEMOLIST_SUBDIR, '0.5 0.5 0.5');
+
+	// item: screenshot list
+	SKINVECTOR(COLOR_SCREENSHOTLIST_SUBDIR, '0.5 0.5 0.5');
+
 	// item: slider
 	SKINSTRING(GFX_SLIDER, "slider");
 	SKINVECTOR(COLOR_SLIDER_N, '1 1 1');
@@ -257,5 +274,4 @@ SKINBEGIN
 	SKINVECTOR(COLOR_SLIDER_D, '1 1 1');
 	SKINVECTOR(COLOR_SLIDER_S, '1 1 1');
 	SKINFLOAT(WIDTH_SLIDERTEXT, 0.333333333333);
-	SKINVECTOR(TOLERANCE_SLIDER, '0.2 2 0');
 SKINEND