]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 19 Feb 2018 15:15:59 +0000 (01:15 +1000)
committerMario <mario@smbclan.net>
Mon, 19 Feb 2018 15:15:59 +0000 (01:15 +1000)
commitf8cd0686b2a5e6af575d50b47153426d8fbea754
tree70edf21813b76d511e655b0ca654d13a41ef2a54
parentf3c9d62b68cb415609dce698ec2fcd966b8c8ace
parentcbd5749bf3064a7b8cde93d3e366719fc9ca1f6a
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/shambler.qc
16 files changed:
models/monsters/dragon_lod1.dpm
models/monsters/dragon_lod1.dpm.framegroups
models/monsters/dragon_lod2.dpm
models/monsters/dragon_lod2.dpm.framegroups
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/mage.qh
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/spider.qh
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/monster/wyvern.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/triggers/func/breakable.qc
qcsrc/server/autocvars.qh