Merge branch 'master' into Mario/monsters

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

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

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/common/models/all.inc
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
index 319b699a706372cc3aca360df4259d50dfac907c,4c2b5ff269a601b1ff502f3977f97af5552aa532..bdd8e5159a774480ccdd786ff388610be819f74c
--- 1/qcsrc/common/monsters/sv_monsters.qc
--- 2/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -101,7 -88,6 +101,7 @@@ bool Monster_ValidTarget(entity this, e
        || (this.monster_follow == targ || targ.monster_follow == this)
        || (!IS_VEHICLE(targ) && (targ.flags & FL_NOTARGET))
        || (!autocvar_g_monsters_typefrag && PHYS_INPUT_BUTTON_CHAT(targ))
-       || (IS_VEHICLE(targ) && !((Monsters_from(this.monsterid)).spawnflags & MON_FLAG_RANGED)) // melee vs vehicle is useless
++      || (IS_VEHICLE(targ) && !((REGISTRY_GET(Monsters, this.monsterid)).spawnflags & MON_FLAG_RANGED)) // melee vs vehicle is useless
        || (SAME_TEAM(targ, this))
        || (STAT(FROZEN, targ))
        || (targ.alpha != 0 && targ.alpha < 0.5)

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/command/common.qc
Simple merge

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

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

diff --cc qcsrc/server/miscfunctions.qh
Simple merge