Merge branch 'master' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Wed, 23 Jan 2013 10:32:27 +0000 (11:32 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 23 Jan 2013 10:32:27 +0000 (11:32 +0100)
Conflicts:
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh

15 files changed:
1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/csqcmodellib/cl_model.qc
qcsrc/csqcmodellib/interpolate.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/g_subs.qc
qcsrc/server/t_jumppads.qc
qcsrc/server/w_electro.qc

Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge