]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 13 Sep 2019 12:54:55 +0000 (22:54 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 13 Sep 2019 12:54:55 +0000 (22:54 +1000)
commit2e60d4af0278db5d39618bf8fee353c220d90486
tree6050f03c6ba5caf839ddd7dc86977a64f29fd96d
parent03ed80121e3ad6fe951526b198c66f9ca1b4ab49
parent3736bf14e0bd070de0a938e3b92d7f5eb35d0ae6
Merge branch 'master' into Mario/monsters
12 files changed:
qcsrc/common/mapinfo.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/mage.qh
qcsrc/common/monsters/monster/spider.qh
qcsrc/common/monsters/monster/wyvern.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/sv_turrets.qh
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc