Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 25 Aug 2011 12:36:41 +0000 (15:36 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 25 Aug 2011 12:36:41 +0000 (15:36 +0300)
commitf2a79cba0897fb6f6cb7ebeecb596b5547af3ddd
treeb8caf30f6bbb7b5c35d9e50b8428d19168699754
parentdd1c17f2775c0249509992ee85edb71020fa09e9
parentf3cd6e8e994c399d573bf829b43ef04efb6d1a67
Merge branch 'master' into mirceakitsune/damage_effects

Conflicts:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
12 files changed:
defaultXonotic.cfg
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc