From: Samual Lenks <samual@xonotic.org>
Date: Fri, 24 Jan 2014 21:33:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/combined_updates
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bed0faf9537a0cddd6aadf29625458da94bbf5f1;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	defaultXonotic.cfg
---

bed0faf9537a0cddd6aadf29625458da94bbf5f1
diff --cc defaultXonotic.cfg
index 3de8f01f3,624a581a3..c93f2bf05
--- a/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"