]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Wed, 17 May 2017 11:10:34 +0000 (21:10 +1000)
committerMario <mario@smbclan.net>
Wed, 17 May 2017 11:10:34 +0000 (21:10 +1000)
commitcb59b311300c40af8877478269e4e2cabc965529
tree04f85bfae1c2dd89a884a6e307ec37663d38d694
parent155668ad2440426923ac70c306b84c2d27a5bb28
parentb9e51e017e82c55ae91673b22e655bfe0ef43b0a
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/monsters/monster/mage.qh
# qcsrc/common/monsters/monster/shambler.qh
# qcsrc/common/monsters/monster/spider.qh
# qcsrc/common/monsters/monster/wyvern.qh
qcsrc/common/monsters/monster/mage.qh
qcsrc/common/monsters/monster/spider.qh
qcsrc/common/monsters/monster/troll.qh
qcsrc/common/monsters/monster/wyvern.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/client.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc