X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fskin-customizables.inc;h=15bd5356b883a7905309d44506ed9ff9bc79f491;hb=24e85b08e926ae6fa1be129b41fe65a7c208b1fe;hp=ee0e76f399f7efbde625505d3b2fd59db7f84dae;hpb=ee32da5f4dafee5883369c759fe8ed042114bda5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index ee0e76f39..15bd5356b 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);
@@ -70,6 +70,7 @@ SKINBEGIN
 	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_WELCOME, '1 0.7 0.7');
 	SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 	SKINVECTOR(COLOR_DIALOG_SCREENSHOTVIEWER, '0.7 0.7 1');
 	SKINVECTOR(COLOR_DIALOG_HUDCONFIRM, '1 0 0');
@@ -144,9 +145,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);
@@ -178,6 +176,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);
@@ -191,6 +192,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');
@@ -211,11 +215,13 @@ SKINBEGIN
 	SKINVECTOR(COLOR_MODELTITLE, '1 1 1');
 	SKINFLOAT(ALPHA_MODELTITLE, 1);
 
-	// item: player name editor
+	// item: special character picker
 	SKINVECTOR(COLOR_CHARMAP_CHAR, '1 1 1');
 	SKINFLOAT(ALPHA_CHARMAP_CHAR, 1);
-	SKINVECTOR(COLOR_CHARMAP_FOCUS, '0 0 1');
-	SKINFLOAT(ALPHA_CHARMAP_FOCUS, 0.5);
+
+	// item: crosshair picker
+	SKINVECTOR(COLOR_CROSSHAIRPICKER_CROSSHAIR, '1 1 1');
+	SKINFLOAT(ALPHA_CROSSHAIRPICKER_CROSSHAIR, 1);
 
 	// item: radio button
 	SKINSTRING(GFX_RADIOBUTTON, "radiobutton");
@@ -245,7 +251,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
@@ -270,5 +275,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