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

diff --combined defaultXonotic.cfg
index b04e49c921fbbdc29886c29d1d6b235716afb5e8,b6642452010bfbfe513027d966206d399ddcefb5..c61d7d7ed91adaa5d5fec67aa6a53deec6ea01c0
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -22,10 -22,6 +22,10 @@@ gameversion_max 65535 // git builds se
  //   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"
  
@@@ -62,11 -58,10 +62,11 @@@ _cl_name Playe
  _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"
@@@ -1141,7 -1136,7 +1141,7 @@@ set quit_and_redirect ""        "set to an IP 
  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"
@@@ -1451,7 -1446,6 +1451,7 @@@ seta v_kicktime $v_kicktim
  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
@@@ -1782,6 -1776,7 +1782,7 @@@ seta cl_forceplayercolors 0 "make every
  seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)"
  seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (requires server to have sv_use_csqc_players 1; does not affect how enemies look with cl_forceplayermodels)"
  seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (requires server to have sv_use_csqc_players 1, and is ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"
+ seta cl_predictionerrorcompensation 0 "try to compensate for prediction errors and reduce preceived lag (requires server to have sv_use_csqc_players 1)"
  
  // debug cvars for keyhunt attaching
  set _angles "0 0 0"