]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 8 Nov 2020 11:16:53 +0000 (21:16 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 8 Nov 2020 11:16:53 +0000 (21:16 +1000)
commit80e96d3476de18ec2d27c905eb789bd39b2f52f9
treed4571ef59c186cb58032782fad3825040aabaf16
parent1e176ef531627d4ea57dcb8b3064e996991f4b76
parentdfebc2fb9d2738748fb0032b41c2acda657757a2
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/mapobjects/func/breakable.qc
qcsrc/common/models/all.inc
qcsrc/common/monsters/monster.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/monsters/sv_monsters.qh
qcsrc/common/notifications/all.inc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/sv_turrets.qh
qcsrc/server/command/common.qc
qcsrc/server/world.qc
qcsrc/server/world.qh