From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 13 Oct 2010 09:52:13 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/fruitiex/viewoffsfix'
X-Git-Tag: xonotic-v0.1.0preview~307^2~12^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06831b03595a3e450bf120d56d54f7e32c603cbe;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'refs/remotes/origin/fruitiex/viewoffsfix'
---

06831b03595a3e450bf120d56d54f7e32c603cbe
diff --cc defaultXonotic.cfg
index 24547c8ea,3ca9e1271..1de356f66
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -352,12 -339,12 +352,12 @@@ set sv_fragmessage_information_typefra
  
  // use default physics
  set sv_friction_on_land 0
 -exec physicsNoQWBunny-nexbased.cfg
 +exec physicsNoQWBunny-xpmbased.cfg
  
- set sv_player_viewoffset "0 0 35" "view offset of the player model"
+ set sv_player_viewoffset "0 0 42" "view offset of the player model"
  set sv_player_mins "-16 -16 -24" "playermodel mins"
  set sv_player_maxs "16 16 45" "playermodel maxs"
- set sv_player_crouch_viewoffset "0 0 15" "view offset of the player model when crouched"
+ set sv_player_crouch_viewoffset "0 0 20" "view offset of the player model when crouched"
  set sv_player_crouch_mins "-16 -16 -24" "mins of a crouched playermodel"
  set sv_player_crouch_maxs "16 16 25" "maxs of a crouched playermodel"