Merge branch 'bones_was_here/font' into 'master'

[xonotic/xonotic-data.pk3dir.git] / xonotic-client.cfg

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 58eb9b8a23da3dc55bf2404bb3cd5023c42c7ddb..d427b0f5a7fe73edb0ebd0510fb003778243a469 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -24,14 +24,14 @@ cl_particles_forcetraileffects 1
 
 alias dropweapon "impulse 17"
 
+// support for servers still using the old centreprint MOTD
 alias +show_info0 "+button7"
 alias -show_info0 "-button7"
 alias +show_info1 "menu_showwelcomedialog"
 alias -show_info1 ""
-
-seta cl_welcome_in_menu_dialog 1 "1: show the welcome message in a dedicated menu dialog; 0: show it as a centerprint message"
-alias +show_info +show_info$cl_welcome_in_menu_dialog
-alias -show_info -show_info$cl_welcome_in_menu_dialog
+alias +show_info +show_info$_menu_welcome_dialog_available
+alias -show_info -show_info$_menu_welcome_dialog_available
+seta cl_welcome 1 "1: show the Welcome dialog when connecting; 0: show it only when +show_info keybind is pressed"
 
 // merge lightmaps up to 2048x2048 textures
 mod_q3bsp_lightmapmergepower 4
@@ -766,7 +766,7 @@ set cl_accuracy_data_receive 0 "1 receive weapon accuracy data statistics at the
 set developer_csqcentities 0 "csqc entity spam"
 
 seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)"
-seta cl_forceplayercolors 0 "make enemies look like your own color (requires server to have sv_defaultcharacter 0); 1: in all game modes without teams (if cl_forceplayercolors_unique is 0), 2: always, 3: only in Duel, 4: only in game modes with 2 teams, 5: in team games and Duel"
+seta cl_forceplayercolors 0 "make enemies look like your own color (requires server to have sv_defaultcharacter 0); 1: in all game modes without teams (if cl_forceuniqueplayercolors is 0), 2: always, 3: only in Duel, 4: only in game modes with 2 teams, 5: in team games and Duel"
 seta cl_forceuniqueplayercolors 0 "assign each enemy unique colors in all game modes without teams except duel (requires server to have sv_defaultcharacter 0)"
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"