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)
12 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge