Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'

diff --git a/models/player/pyria.iqm_0.tga b/models/player/pyria.iqm_0.tga
index 96f53c8ff1d2468e94a51e586e3cac5fb97599d8..7b81093b853deac56976cf6f12c4ab8eb5723508 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ

diff --git a/models/player/umbra.iqm_0.tga b/models/player/umbra.iqm_0.tga
index f515b2feb6049b42e94ef2772e8aaa865bdadacb..726d3298190e184e23a2a65a5be13e86c12370fb 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ

diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
index 88290d68c4c1feb0676d57b3544704473b9e7dc3..7806e4c24f78f7cba8c8151ad671dfa0a2565f5f 100644 (file)
--- a/physicsNoQWBunny.cfg
+++ b/physicsNoQWBunny.cfg
@@ -12,7 +12,7 @@ sv_jumpvelocity 300
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction -0.125
-sv_airaccel_qw -0.95
+sv_airaccel_qw -0.965
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0

diff --git a/qcsrc/server/extensions.qh b/qcsrc/server/extensions.qh
index ea6f0b068945772a13e3aecf340e2dc461fcd35d..18119546c63d1b82d5bd6a188961647d98f39968 100644 (file)
--- a/qcsrc/server/extensions.qh
+++ b/qcsrc/server/extensions.qh
@@ -572,12 +572,10 @@ float(float a) tan = #475; // returns tangent value (which is simply sin(a)/cos(
 // string autocvar__cl_name;
 //NOTE: copying a string-typed autocvar to another variable/field, and then
 //changing the cvar or returning from progs is UNDEFINED. Writing to autocvar
-//globals is UNDEFINED.  Accessing autocvar globals after cvar_set()ing that
+//globals is UNDEFINED. Accessing autocvar globals after cvar_set()ing that
 //cvar is IMPLEMENTATION DEFINED (an implementation may either yield the
-//previous, or the current, value). Whether autocvar globals, after restoring
-//a savegame, have the cvar's current value, or the original value at time of
-//saving, is UNDEFINED. Restoring a savegame however must not restore the
-//cvar values themselves.
+//previous, or the current, value). Writing to an autocvar global is NOT
+//ALLOWED.
 //In case the cvar does NOT exist, then it is automatically created with the
 //value of the autocvar initializer, if given. This is possible with e.g.
 //frikqcc and fteqcc the following way: