Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sun, 17 Mar 2019 09:54:59 +0000 (19:54 +1000)
committerMario <mario@smbclan.net>
Sun, 17 Mar 2019 09:54:59 +0000 (19:54 +1000)
commitf70b6498d323bf8ee9bbdc9fe413ac1fbf94ccd8
tree738c35624e82a4d368cb21f658f9cf0ad2efe15c
parent24dbcdb6845f17ad1f0509bc173caabee9e6f2bb
parent1729cb8b0a6953056407faa84b6d4ad9e05759b4
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/client/csqcmodel_hooks.qc
# qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc
# qcsrc/common/monsters/monster/mage.qc
# qcsrc/common/monsters/monster/shambler.qc
# qcsrc/common/monsters/sv_monsters.qc
18 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/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/common/turrets/turret/ewheel.qc
qcsrc/common/turrets/turret/walker.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/command/common.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc