Merge branch 'master' into Mario/monsters_broken
authorMario <zacjardine@y7mail.com>
Sat, 29 Aug 2015 11:54:45 +0000 (21:54 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 29 Aug 2015 11:54:45 +0000 (21:54 +1000)
commit1556aa4ea70b3b275afb1cb4587e555fb44f71c3
tree8e2a4511892ea91818eb3be377c8a33aa9cb1f2b
parent9ca8996c2022c821fe36f687b84034bec8269b55
parent9e6de751aaa2a918708f80735a006a03e84f2fcf
Merge branch 'master' into Mario/monsters_broken

# Conflicts:
# qcsrc/common/monsters/all.inc
# qcsrc/common/monsters/all.qc
# qcsrc/common/monsters/all.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/server/command/cmd.qc
# qcsrc/server/command/sv_cmd.qc
# qcsrc/server/mutators/base.qh
16 files changed:
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/animdecide.qc
qcsrc/common/monsters/all.inc
qcsrc/common/monsters/all.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/server/autocvars.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/gamemode_invasion.qc