Merge remote branch 'origin/mirceakitsune/gunmodel_effects'

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10219 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0eb435e2105218df21252d8bd3dded4a649b382c

diff --git a/darkplaces.txt b/darkplaces.txt
index 5e5293702b127c34dad769afdea4f2ed7d17d6ae..ae8dc9b3a49f28950e215bdc30de34fd8ce6c9e3 100644 (file)
--- a/darkplaces.txt
+++ b/darkplaces.txt
@@ -400,27 +400,27 @@ cl_bobmodel                                       1                   enables gu
 cl_bobmodel_side                                  0.05                gun bobbing sideways sway amount
 cl_bobmodel_speed                                 7                   gun bobbing speed
 cl_bobmodel_up                                    0.02                gun bobbing upward movement amount
-cl_leanmodel                                      1                   enables gun leaning
-cl_leanmodel_side_speed                           20                  gun leaning sideways speed
+cl_leanmodel                                      0                   enables gun leaning
+cl_leanmodel_side_speed                           0.7                 gun leaning sideways speed
 cl_leanmodel_side_limit                           35                  gun leaning sideways limit
-cl_leanmodel_side_highpass1                       5                   gun leaning sideways pre-highpass in 1/s
-cl_leanmodel_side_highpass                        15                  gun leaning sideways highpass in 1/s
+cl_leanmodel_side_highpass1                       30                  gun leaning sideways pre-highpass in 1/s
+cl_leanmodel_side_highpass                        5                   gun leaning sideways highpass in 1/s
 cl_leanmodel_side_lowpass                         30                  gun leaning sideways lowpass in 1/s
-cl_leanmodel_up_speed                             15                  gun leaning upward speed
-cl_leanmodel_up_limit                             25                  gun leaning upward limit
+cl_leanmodel_up_speed                             0.65                gun leaning upward speed
+cl_leanmodel_up_limit                             50                  gun leaning upward limit
 cl_leanmodel_up_highpass1                         5                   gun leaning upward pre-highpass in 1/s
 cl_leanmodel_up_highpass                          15                  gun leaning upward highpass in 1/s
 cl_leanmodel_up_lowpass                           30                  gun leaning upward lowpass in 1/s
-cl_followmodel                                    1                   enables gun following
-cl_followmodel_side_speed                         0.015               gun following sideways speed
-cl_followmodel_side_limit                         4                   gun following sideways limit
-cl_followmodel_side_highpass1                     5                   gun following sideways pre-highpass in 1/s
-cl_followmodel_side_highpass                      15                  gun following sideways highpass in 1/s
+cl_followmodel                                    0                   enables gun following
+cl_followmodel_side_speed                         0.25                gun following sideways speed
+cl_followmodel_side_limit                         6                   gun following sideways limit
+cl_followmodel_side_highpass1                     30                  gun following sideways pre-highpass in 1/s
+cl_followmodel_side_highpass                      5                   gun following sideways highpass in 1/s
 cl_followmodel_side_lowpass                       30                  gun following sideways lowpass in 1/s
-cl_followmodel_up_speed                           0.01                gun following upward speed
-cl_followmodel_up_limit                           2                   gun following upward limit
-cl_followmodel_up_highpass1                       5                   gun following upward pre-highpass in 1/s
-cl_followmodel_up_highpass                        15                  gun following upward highpass in 1/s
+cl_followmodel_up_speed                           0.5                 gun following upward speed
+cl_followmodel_up_limit                           5                   gun following upward limit
+cl_followmodel_up_highpass1                       60                  gun following upward pre-highpass in 1/s
+cl_followmodel_up_highpass                        3                   gun following upward highpass in 1/s
 cl_followmodel_up_lowpass                         30                  gun following upward lowpass in 1/s
 cl_bobup                                          0.5                 view bobbing adjustment that makes the up or down swing of the bob last longer
 cl_capturevideo                                   0                   enables saving of video to a .avi file using uncompressed I420 colorspace and PCM audio, note that scr_screenshot_gammaboost affects the brightness of the output)

diff --git a/view.c b/view.c
index a8a38b39d523fd614ad38cc1083f0e6b6073b7a6..34ca8c4b5fae2ec43b4a02d9cadb26ad8660da07 100644 (file)
--- a/view.c
+++ b/view.c
@@ -46,24 +46,24 @@ cvar_t cl_bobmodel_up = {CVAR_SAVE, "cl_bobmodel_up", "0.06", "gun bobbing upwar
 cvar_t cl_bobmodel_speed = {CVAR_SAVE, "cl_bobmodel_speed", "7", "gun bobbing speed"};
 
 cvar_t cl_leanmodel = {CVAR_SAVE, "cl_leanmodel", "0", "enables gun leaning"};
-cvar_t cl_leanmodel_side_speed = {CVAR_SAVE, "cl_leanmodel_side_speed", "1", "gun leaning sideways speed"};
+cvar_t cl_leanmodel_side_speed = {CVAR_SAVE, "cl_leanmodel_side_speed", "0.7", "gun leaning sideways speed"};
 cvar_t cl_leanmodel_side_limit = {CVAR_SAVE, "cl_leanmodel_side_limit", "35", "gun leaning sideways limit"};
 cvar_t cl_leanmodel_side_highpass1 = {CVAR_SAVE, "cl_leanmodel_side_highpass1", "30", "gun leaning sideways pre-highpass in 1/s"};
 cvar_t cl_leanmodel_side_highpass = {CVAR_SAVE, "cl_leanmodel_side_highpass", "5", "gun leaning sideways highpass in 1/s"};
 cvar_t cl_leanmodel_side_lowpass = {CVAR_SAVE, "cl_leanmodel_side_lowpass", "30", "gun leaning sideways lowpass in 1/s"};
-cvar_t cl_leanmodel_up_speed = {CVAR_SAVE, "cl_leanmodel_up_speed", "1", "gun leaning upward speed"};
+cvar_t cl_leanmodel_up_speed = {CVAR_SAVE, "cl_leanmodel_up_speed", "0.65", "gun leaning upward speed"};
 cvar_t cl_leanmodel_up_limit = {CVAR_SAVE, "cl_leanmodel_up_limit", "50", "gun leaning upward limit"};
 cvar_t cl_leanmodel_up_highpass1 = {CVAR_SAVE, "cl_leanmodel_up_highpass1", "5", "gun leaning upward pre-highpass in 1/s"};
 cvar_t cl_leanmodel_up_highpass = {CVAR_SAVE, "cl_leanmodel_up_highpass", "15", "gun leaning upward highpass in 1/s"};
 cvar_t cl_leanmodel_up_lowpass = {CVAR_SAVE, "cl_leanmodel_up_lowpass", "30", "gun leaning upward lowpass in 1/s"};
 
 cvar_t cl_followmodel = {CVAR_SAVE, "cl_followmodel", "0", "enables gun following"};
-cvar_t cl_followmodel_side_speed = {CVAR_SAVE, "cl_followmodel_side_speed", "0.5", "gun following sideways speed"};
+cvar_t cl_followmodel_side_speed = {CVAR_SAVE, "cl_followmodel_side_speed", "0.25", "gun following sideways speed"};
 cvar_t cl_followmodel_side_limit = {CVAR_SAVE, "cl_followmodel_side_limit", "6", "gun following sideways limit"};
 cvar_t cl_followmodel_side_highpass1 = {CVAR_SAVE, "cl_followmodel_side_highpass1", "30", "gun following sideways pre-highpass in 1/s"};
 cvar_t cl_followmodel_side_highpass = {CVAR_SAVE, "cl_followmodel_side_highpass", "5", "gun following sideways highpass in 1/s"};
 cvar_t cl_followmodel_side_lowpass = {CVAR_SAVE, "cl_followmodel_side_lowpass", "30", "gun following sideways lowpass in 1/s"};
-cvar_t cl_followmodel_up_speed = {CVAR_SAVE, "cl_followmodel_up_speed", "1", "gun following upward speed"};
+cvar_t cl_followmodel_up_speed = {CVAR_SAVE, "cl_followmodel_up_speed", "0.5", "gun following upward speed"};
 cvar_t cl_followmodel_up_limit = {CVAR_SAVE, "cl_followmodel_up_limit", "5", "gun following upward limit"};
 cvar_t cl_followmodel_up_highpass1 = {CVAR_SAVE, "cl_followmodel_up_highpass1", "60", "gun following upward pre-highpass in 1/s"};
 cvar_t cl_followmodel_up_highpass = {CVAR_SAVE, "cl_followmodel_up_highpass", "3", "gun following upward highpass in 1/s"};