Merge branch 'master' into terencehill/bot_waypoints

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

diff --git a/defaultClient.cfg b/defaultClient.cfg
index 2b6c9582deeb9d5ef4b1ab0818a14c37a4ca96cb..e4904ff58134dea57a745398fb65123d1f3b035c 100644 (file)
--- a/defaultClient.cfg
+++ b/defaultClient.cfg
@@ -1,3 +1,7 @@
+// this resets most client cvars and aliases to their defaults
+// if you want to reset your client to defaults, it's probably a better idea to delete (parts of) config.cfg and restart
+
+
 // changes a cvar and reports it to the server (for the menu to notify the
 // server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
@@ -22,11 +26,13 @@ alias dropweapon "impulse 17"
 alias +show_info +button7
 alias -show_info -button7
 
+// merge lightmaps up to 2048x2048 textures
+mod_q3bsp_lightmapmergepower 4
+
 // player defaults
 _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
 _cl_name ""
 seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)"
-_cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
 seta cl_reticle 1 "enable zoom reticles"
@@ -89,6 +95,10 @@ vid_conheight 600
 // menu_conwidth, menu_conheight are set inside quake.rc
 v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
 
+// create a temporary empty alias for menu_sync so that execution of effects-normal.cfg, hud_luma.cfg
+// and sRGB-{disable,enable}.cfg on game start doesn't show an error message in the console
+alias menu_sync "" // will be re-aliased later
+
 // we want to use sRGB for our maps!
 exec sRGB-disable.cfg
 vid_sRGB_fallback 2
@@ -219,7 +229,6 @@ cl_movement 1
 cl_movement_track_canjump 0
 cl_stairsmoothspeed 200
 
-// FIXME test
 alias g_waypointeditor_spawn "impulse 103"
 alias g_waypointeditor_remove "impulse 104"
 alias g_waypointeditor_relinkall "impulse 105"
@@ -259,7 +268,7 @@ r_shadow_realtime_world_lightmaps 1
 r_shadow_realtime_world_importlightentitiesfrommap 0 // Whether build process uses keepLights is nontransparent and may change, so better make keepLights not matter.
 cl_decals_fadetime 5
 cl_decals_time 1
-seta cl_gunalign 3 "Gun alignment; 1 = center (if allowed by g_shootfromclient) or right, 2 = center (if allowed by g_shootfromclient) or left, 3 = right only, 4 = left only"
+seta cl_gunalign 3 "Gun alignment; 1 = center, 3 = right, 4 = left; requires reconnect"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"
 seta cl_gibs_damageforcescale 3.5 "force to push around gibs"
@@ -284,8 +293,6 @@ r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1
 r_glsl_offsetmapping_reliefmapping 0
 r_glsl_offsetmapping_scale 0.02
-// execute effects-normal.cfg to make sure that all effect settings are reset
-alias menu_sync "" // will be re-aliased later
 
 scr_conalpha 1
 scr_conbrightness 0.2
@@ -696,6 +703,8 @@ seta cl_noantilag 0 "turn this on if you believe antilag is bad"
 set cl_accuracy_data_share 0 "1 share my weapon accuracy data statistics with other players, 0 keep my weapon accuracy data statistics hidden"
 set cl_accuracy_data_receive 0 "1 receive weapon accuracy data statistics at the end of the match"
 
+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); set it to 2 to enable it even in teamplay (only when there is exactly one enemy team)"
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
@@ -804,6 +813,7 @@ scr_loadingscreen_scale_limit 2
 // other config files
 exec effects-normal.cfg
 exec crosshairs.cfg
+exec gamemodes-client.cfg
 exec notifications.cfg
 
 seta cl_physics "default" "client selected physics set"
@@ -815,7 +825,7 @@ exec _hud_descriptions.cfg
 // please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency
 exec hud_luma.cfg
 
-// enable menu syncing
+// enable menu syncing - must be after files that call menu_sync on startup - see alias menu_sync ""
 alias menu_sync "menu_cmd sync"
 
 seta cl_items_nofade 0