Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sat, 1 Aug 2020 02:22:36 +0000 (12:22 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 1 Aug 2020 02:22:36 +0000 (12:22 +1000)
commit8782d4625fb1b3e338da59e947a05e0dbcf4a493
treed02a1c47a36e5c00cc882ccdaf52aa56086cdd2c
parentfd22b6969ce7ce968820153ac985370a4db650d9
parent340221e0b0251b0caf1036bc06912f2e40256f88
Merge branch 'master' into Mario/monsters
17 files changed:
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
qcsrc/common/mapobjects/func/breakable.qc
qcsrc/common/monsters/monster.qh
qcsrc/common/monsters/monster/golem.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
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/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh