]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 29 Apr 2022 12:43:46 +0000 (22:43 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 29 Apr 2022 12:43:46 +0000 (22:43 +1000)
commit323105d51f8eb6dea47c063965be5e34ad57f987
tree4f419c9de36344c82555fc4d65beb391280ee4ef
parentf53cfd3a6161ba8b7a62bd953d18e689f051b337
parentdad0572b6112ed622fd0c19850e9036867f8833b
Merge branch 'master' into Mario/monsters
17 files changed:
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qh
qcsrc/common/mapobjects/func/breakable.qc
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/spider.qh
qcsrc/common/monsters/monster/zombie.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/command/common.qc
qcsrc/server/world.qc
qcsrc/server/world.qh