From: Rudolf Polzer Date: Wed, 23 Jan 2013 10:32:27 +0000 (+0100) Subject: Merge branch 'master' into divVerent/csad X-Git-Tag: xonotic-v0.7.0~99^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7170086b517c814aa5ea60985993900492c8770a;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/csad Conflicts: qcsrc/client/Main.qc qcsrc/client/autocvars.qh --- 7170086b517c814aa5ea60985993900492c8770a diff --cc qcsrc/client/autocvars.qh index 3029dbe81,cb06932e4..0c926d43c --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@@ -404,4 -407,4 +407,5 @@@ string autocvar__cl_playermodel float autocvar_cl_precacheplayermodels; float autocvar_cl_deathglow; float autocvar_developer_csqcentities; +float autocvar__animblend; + float autocvar_g_jetpack_attenuation;