Merge branch 'master' into terencehill/weaponmodel_effects_2

diff --combined defaultXonotic.cfg
index 573ff061175fdaf2c9080b583692f66dc73f320b,7bc9466eb45bdec8b53dd4d28bd559d8927d8e51..2afed6270ef8f20544227f8048b0749f4f09f140
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -163,20 -163,28 +163,20 @@@ cl_bobmodel 1 // whether to have gun mo
  cl_bobmodel_side 0.2 // amount the gun sways to the sides
  cl_bobmodel_speed 5 // rate at which the gun sways
  cl_bobmodel_up 0.1 // amount the gun sways up and down
 -cl_leanmodel 1 // enables weapon leaning effect when looking around
 -cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
 -cl_leanmodel_side_limit 35 "gun leaning sideways limit"
 -cl_leanmodel_side_highpass1 30 "gun leaning sideways pre-highpass in 1/s"
 -cl_leanmodel_side_highpass 3 "gun leaning sideways highpass in 1/s"
 -cl_leanmodel_side_lowpass 20 "gun leaning sideways lowpass in 1/s"
 -cl_leanmodel_up_speed 0.65 "gun leaning upward speed"
 -cl_leanmodel_up_limit 50 "gun leaning upward limit"
 -cl_leanmodel_up_highpass1 5 "gun leaning upward pre-highpass in 1/s"
 -cl_leanmodel_up_highpass 15 "gun leaning upward highpass in 1/s"
 -cl_leanmodel_up_lowpass 20 "gun leaning upward lowpass in 1/s"
 +
  cl_followmodel 1 // enables weapon pushing / pulling effect when walking
 -cl_followmodel_side_speed 0.25 "gun following sideways speed"
 -cl_followmodel_side_limit 6 "gun following sideways limit"
 -cl_followmodel_side_highpass1 30 "gun following sideways pre-highpass in 1/s"
 -cl_followmodel_side_highpass 5 "gun following sideways highpass in 1/s"
 -cl_followmodel_side_lowpass 10 "gun following sideways lowpass in 1/s"
 -cl_followmodel_up_speed 0.5 "gun following upward speed"
 -cl_followmodel_up_limit 5 "gun following upward limit"
 -cl_followmodel_up_highpass1 60 "gun following upward pre-highpass in 1/s"
 -cl_followmodel_up_highpass 2 "gun following upward highpass in 1/s"
 -cl_followmodel_up_lowpass 10 "gun following upward lowpass in 1/s"
 +seta cl_followmodel_speed 0.3 "gun following sideways speed"
 +seta cl_followmodel_limit 1000 "gun following sideways limit"
 +seta cl_followmodel_highpass1 0.05 "gun following sideways pre-highpass averaging time"
 +seta cl_followmodel_highpass 0.05 "gun following sideways highpass averaging time"
 +seta cl_followmodel_lowpass 0.03 "gun following sideways lowpass averaging time"
 +
 +cl_leanmodel 1 // enables weapon leaning effect when looking around
 +seta cl_leanmodel_speed 0.3 "gun leaning sideways speed"
 +seta cl_leanmodel_limit 1000 "gun leaning sideways limit"
 +seta cl_leanmodel_highpass1 0.2 "gun leaning sideways pre-highpass averaging time"
 +seta cl_leanmodel_highpass 0.2 "gun leaning sideways highpass averaging time"
 +seta cl_leanmodel_lowpass 0.05 "gun leaning sideways lowpass averaging time"
  
  cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
  v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds
@@@ -400,6 -408,7 +400,7 @@@ alias g_waypointeditor_unreachable "imp
  locs_enable 0
  pausable 0
  set g_spawnshieldtime 1 "number of seconds you are invincible after you spawned, this shield is lost after you fire"
+ set g_spawnshield_blockdamage 1 "how much spawn shield protects you from damage (1 = full protection)"
  set g_antilag 2       "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)"
  set g_antilag_nudge 0 "don't touch"
  set g_shootfromeye 0 "shots are fired from your eye/crosshair; visual gun position can still be influenced by cl_gunalign 1 and 2"
@@@ -1170,7 -1179,7 +1171,7 @@@ set waypoint_benchmark 0 "quit after wa
  set g_debug_bot_commands 0 "print scripted bot commands before executing"
  set g_debug_defaultsounds 0 "always use default sounds"
  seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)"
- seta cl_forceplayercolors 0 "make everyone 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 are no more than two teams)"
+ 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)"
  seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (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 (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"