Merge branch 'Mario/monsters' into 'develop'
authorbones_was_here <bones_was_here@xa.org.au>
Sat, 4 Jun 2022 12:43:50 +0000 (12:43 +0000)
committerbones_was_here <bones_was_here@xa.org.au>
Sat, 4 Jun 2022 12:43:50 +0000 (12:43 +0000)
commit561489d21c9053b7103c6604c362aa24ee5c7916
tree376de037e5841203ab403049902a9da7651e641d
parentadca4b74a8d369181f57b88a697f48b81f0f3726
parent9f05324845e464bab02e79a7a8ad3fb74bb3c8f3
Merge branch 'Mario/monsters' into 'develop'

Merge branch Mario/monsters (L merge request)

See merge request xonotic/xonotic-data.pk3dir!1017
gamemodes-server.cfg
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/server/world.qc
xonotic-client.cfg