]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/gamemodes/gamemode/invasion/invasion.qh
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 07:42:14 +0000 (17:42 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 07:42:14 +0000 (17:42 +1000)
commit5c4e0198b632b298df925652359182f52f3a253f
tree33b5547519a22d1fb965ea79f7d7c02519d770c9
parentfc48d5efba26c57b5ceb719e840d8824fdebb2bc
parent4181392df811a93dee6b97c303c3f7655f2f0a23
Merge branch 'master' into Mario/monsters
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/mapobjects/func/breakable.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh