Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Mon, 12 Dec 2016 14:02:45 +0000 (00:02 +1000)
committerMario <mario@smbclan.net>
Mon, 12 Dec 2016 14:02:45 +0000 (00:02 +1000)
commit0f6c4bee8db75b0aded48382af1c2693b19624de
tree186bc969e9109fc51da22f69ab91eb929c42f586
parent9755de88ca66529c0efa49b24c50de94e6a013f5
parentfaa18c987f83ea9e8dc63aec9ecbc5eeb6420e2b
Merge branch 'master' into Mario/wepent_experimental
21 files changed:
mutators.cfg
qcsrc/client/defs.qh
qcsrc/client/view.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/stats.qh
qcsrc/common/t_items.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/raptor.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/scripting.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/player.qc
qcsrc/server/weapons/weaponsystem.qc