Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 19 Oct 2011 20:20:15 +0000 (23:20 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 19 Oct 2011 20:20:15 +0000 (23:20 +0300)
commita8f44b0e98aedacaae872b937ee023e24fc30878
treed27bf0d6b511aa2f53a9e1a2064ece2ecb5e8b2c
parentdce1a493a7df370cb4134647d703ebd5c0a28232
parente97635c30f323b6915038e9efb8e5e97873bad64
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/damage.qc
qcsrc/common/constants.qh
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc