Merge branch 'master' into Mario/is_macro
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 05:54:22 +0000 (15:54 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 05:54:22 +0000 (15:54 +1000)
commita11e3217808e6c8f2c971401ba2bcc43578832b1
treedf441b17c096362c0793e00ee4b29dcad8a8157e
parentafc9bb4ccb492be6e06666efb664eae748e0bd30
parente500c4c3ae16913240d1bd0509e68510195f2872
Merge branch 'master' into Mario/is_macro
12 files changed:
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/weapons/w_arc.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/vehicle.qc