Merge in xonotic/xonotic-data.pk3dir.git: samual/defaults/smoothcrouch_enable
git-manager created issue #390 (closed) on 2011-04-04T00:39:57Z:
Reason of request:
This enables a featured I added in the engine a while ago which basically smooths the view when crouching (previously it was an instant switch... which looked very odd.) This was SUPPOSED to be added into master a long time ago, but I didn't notice as I had it in my config.
Just a simple adding of the cvar to defaultXonotic.cfg
Repository: xonotic/xonotic-data.pk3dir.git Commit: 1aab4180 Branch: samual/defaults/smoothcrouch_enable
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '1aab4180731de54921bb9bf60299335e6a7bfc25'..'origin/samual/defaults/smoothcrouch_enable'
git merge --no-ff 'origin/samual/defaults/smoothcrouch_enable'
git push && git push --delete origin 'samual/defaults/smoothcrouch_enable'
Diffstat:
defaultXonotic.cfg | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Revision log:
commit 1aab4180731de54921bb9bf60299335e6a7bfc25
Author: Samual
Commit: Samual
This enables a featured I added in the engine a while ago which basically smooths the view when crouching (previously it was an instant switch... which looked very odd.) This was SUPPOSED to be added into master a long time ago, but I didn't notice as I had it in my config.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/defaultXonotic.cfg b/defaultXonotic.cfg
index e9e50c5..bddddb1 100644
— a/defaultXonotic.cfg
**+ b/defaultXonotic.cfg
@ -241,6 +241,7
@ vid_conheight 600
v_deathtilt 0 // needed for spectators
// these settings determine how much the view is affected by movement/damage
*cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
cl_deathfade 1 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02