]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Tue, 19 Jun 2018 14:15:16 +0000 (00:15 +1000)
committerMario <mario@smbclan.net>
Tue, 19 Jun 2018 14:15:16 +0000 (00:15 +1000)
commit066b04f9c76d2416846e67b05c7f337328cb97eb
tree053cb4dcbdeb479ea3859ae1ebb64ab5dbeabb81
parent49246b5b5696c63b766204056043305a13e2f887
parentff8c8aa65707b6114d26fa545a11fda69bd0b4a1
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/gamemodes/gamemode/invasion/invasion.qc
qcsrc/common/mapobjects/func/breakable.qc
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/monster/mage.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/common/notifications/all.inc