Merge branch 'master' into mirceakitsune/event_chasecam

diff --cc defaultXonotic.cfg
index 513f5e54da146623905770396992dee380a7c0bd,bddddb12e409430f7dfa9a41e8dd8e470c1b3b39..6a5a8aeb358eced8a6d3ee9bb45db2778bd2cf81
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -241,7 -241,8 +241,8 @@@ vid_conheight 60
  v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
  
  // these settings determine how much the view is affected by movement/damage
 -cl_deathfade 1 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
 +cl_deathfade 0.03 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
+ cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
  cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
  cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
  cl_bob2cycle 0 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6