Merge remote branch 'origin/master' into samual/menu_updates

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b6642452010bfbfe513027d966206d399ddcefb5..c61d7d7ed91adaa5d5fec67aa6a53deec6ea01c0 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -22,6 +22,10 @@ gameversion_max 65535 // git builds see all versions
 //   gameversion_min = (gameversion / 100) * 100 - 100
 //   gameversion_max = (gameversion / 100) * 100 + 199
 
+// 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\""
+
 seta cl_firststart "" "how many times the client has been run"
 seta cl_startcount 0 "how many times the client has been run"
 
@@ -58,10 +62,11 @@ _cl_name Player
 _cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 seta crosshair 16
+seta crosshair_enabled 2 // main toggle for enabling/disabling crosshair rendering, used mostly just for the menu... 1 = with per-weapon crosshairs, 2 = custom crosshair
 seta crosshair_color "0.6 0.8 1"
 seta crosshair_alpha 0.300000
 seta crosshair_size 0.500000
-seta crosshair_dot 1
+seta crosshair_dot 0 
 seta crosshair_dot_alpha 1
 seta crosshair_dot_size 0.600000
 seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair dot"
@@ -1136,7 +1141,7 @@ set quit_and_redirect ""  "set to an IP to redirect all players at the end of the
 set g_campaign 0
 set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
 seta g_campaign_name "xonoticbeta"
-set g_campaign_skill 0
+seta g_campaign_skill -1 // -2 easy -1 medium 0 hard
 
 alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
 alias singleplayer_continue "set scmenu_campaign_goto -1"
@@ -1446,6 +1451,7 @@ seta v_kicktime $v_kicktime
 seta r_subdivisions_tolerance $r_subdivisions_tolerance
 seta vid_gl20 $vid_gl20
 seta vid_gl13 $vid_gl13
+seta r_drawviewmodel $r_drawviewmodel
 
 // ticrate
 //sys_ticrate 0.0166667