Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index 3de8f01f3aae3814db43174aedf49f118bded5c1,624a581a36f18e773b24c0f862bd43f0d363354b..c93f2bf05ff3f0c7f7fb76d89d0788c8c95c8e68
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -59,9 -59,8 +59,9 @@@ seta cl_reticle 1 "control for togglin
  seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
  seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
  seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
- fov 90
+ fov 100
 -seta cl_velocityzoom 0        "velocity based zooming of fov, negative values zoom out"
 +seta cl_velocityzoom 0        "velocity based zooming of fov"
 +seta cl_velocityzoom_factor 0 "factor of fov zooming (negative values zoom out)"
  seta cl_velocityzoom_type 3 "how to factor in speed, 1 = all velocity in all directions, 2 = velocity only in forward direction (can be negative), 3 = velocity only in forward direction (limited to forward only)"
  seta cl_velocityzoom_speed 1000 "target speed for fov factoring"
  seta cl_velocityzoom_time 0.2 "time value for averaging speed values"

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/command/vote.qc
Simple merge