Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Fri, 21 Oct 2016 01:27:13 +0000 (11:27 +1000)
committerMario <mario@smbclan.net>
Fri, 21 Oct 2016 01:27:13 +0000 (11:27 +1000)
commitcc37ae9ec08cca9f8b17cdbf91e71380d0d6f700
tree7f4cdd5b1b7667ef7fb18a9443fe6a9ad899f864
parentca9b32a13aaea249d3b5a90a10aaae170bf6aad5
parent82ab36d1b4c5e08c76c0822cc76fce6fa5ed2cf7
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/common/weapons/weapon/tuba.qc
16 files changed:
qcsrc/common/monsters/monster.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/monster/zombie.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/tuba.qc
qcsrc/server/bot/default/scripting.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc