Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Wed, 16 Nov 2016 23:45:45 +0000 (09:45 +1000)
committerMario <mario@smbclan.net>
Wed, 16 Nov 2016 23:45:45 +0000 (09:45 +1000)
commit64f2b309aa5be8aafb9ad2137174bb6d99aeb876
tree48cbc442116769ad08a48f6c2e1dcd431d97e39a
parent87bec07409c336c956a798556064c6819ad40a4d
parent8a8b1cd92c5071bca66242c7cc75c7756a28fbdc
Merge branch 'master' into Mario/wepent_experimental
qcsrc/common/monsters/monster.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/state.qc
qcsrc/common/t_items.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/scripting.qc
qcsrc/server/player.qc