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)
Merge branch Mario/monsters (L merge request)

See merge request xonotic/xonotic-data.pk3dir!1017

1  2 
gamemodes-server.cfg
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/weapons/projectile.qc
qcsrc/server/world.qc
xonotic-client.cfg

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge