From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 24 May 2010 21:08:37 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/pyriaplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^4
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=7478ee65e419e5cbd39978693820f451ad3c0754;hp=-c

Merge commit 'origin/master' into diabolik/pyriaplayermodel
---

7478ee65e419e5cbd39978693820f451ad3c0754
diff --combined defaultXonotic.cfg
index eb6811bd03,6a01ba59a4..a30856168a
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1751,7 -1751,7 +1751,7 @@@ seta cl_noantilag 0 "turn this on if yo
  
  set sv_pitch_min -35 "minimum aiming angle for shooting direction display of the gun"
  set sv_pitch_max  35 "maximum aiming angle for shooting direction display of the gun"
 -set sv_pitch_fixyaw 1 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0"
 +set sv_pitch_fixyaw 0 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0"
  
  set rescan_pending 0 "set to 1 to schedule a fs_rescan at the end of this match"
  
@@@ -1846,3 -1846,5 +1846,5 @@@ set g_weaponreplace_tuba "
  set g_weaponreplace_fireball ""
  set g_weaponreplace_seeker ""
  set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"
+ 
+ set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"