]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Tue, 20 Jun 2017 23:27:28 +0000 (09:27 +1000)
committerMario <mario@smbclan.net>
Tue, 20 Jun 2017 23:27:28 +0000 (09:27 +1000)
commit78a7f4e2e32cc06b3ba5cb63672ffbec8cb06087
treece196d3b020bcaef6ec4a535893237857e99b005
parent54f63f7e208b41d4f4c348a319859c69ebdb9744
parentcf5201f8f1ee6008289df50610a9fb8fa1bfbac6
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc
# qcsrc/common/monsters/sv_monsters.qc
14 files changed:
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/monster/golem.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/mage.qh
qcsrc/common/monsters/monster/shambler.qh
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/spider.qh
qcsrc/common/monsters/monster/troll.qc
qcsrc/common/monsters/monster/troll.qh
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/monster/wyvern.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/server/defs.qh