]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/dpdefs/upstream/dpextensions.qc
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:
projects / xonotic / xonotic-data.pk3dir.git / commit