Merge branch 'master' into drjaska/sens-setting

diff --cc xonotic-client.cfg
index 3942a46c92a64492ba869ce66a59329e5f0fbbb9,0abbcd72bd3f49cc42f339bb47d3bb4cb2ceb3af..f2020193f77c31d67db27da8f7b49519979df2be
--- 1/xonotic-client.cfg
--- 2/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@@ -76,12 -76,12 +76,12 @@@ seta cl_spawn_point_particles 1 "pointp
  seta cl_spawn_point_dist_max 1200 "maximum distance from which spawnpoint particles will be visible"
  
  freelook 1
- sensitivity 6.0
 -sensitivity 3
++sensitivity 3.0
  v_gamma 1
  viewsize 100
- bgmvolume 1
- // fullscreen 1024x768x32bit
- vid_bitsperpixel 32
+ bgmvolume 0.75
+ 
+ // fullscreen 1024x768
  vid_fullscreen 1
  vid_width 1024
  vid_height 768