Merge branch 'Mario/monsters' into 'develop'

Merge branch Mario/monsters (L merge request)

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

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/client/csqcmodel_hooks.qc
Simple merge

diff --cc qcsrc/client/weapons/projectile.qc
Simple merge

diff --cc qcsrc/server/world.qc
Simple merge

diff --cc xonotic-client.cfg
Simple merge