Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/menu/xonotic/util.qc

diff --cc qcsrc/client/csqcmodel_hooks.qc
index 071bf614e7d2f6baa87af0926c90d257ce1ce391,522859c8b193ea1d4c4729b72ba50d6322aafc5c..b5e0ff5d5da3d97fd64f993ca2e5c39edd90f98d
--- 1/qcsrc/client/csqcmodel_hooks.qc
--- 2/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -610,10 -608,10 +610,10 @@@ void CSQCModel_Hook_PreDraw(entity this
        else
                this.drawmask = MASK_NORMAL;
  
-       if(this.isplayermodel) // this checks if it's a player MODEL!
+       if(this.isplayermodel && this.drawmask) // this checks if it's a player MODEL!
        {
                CSQCPlayer_ModelAppearance_Apply(this, this.entnum == player_localnum + 1);
 -              CSQCPlayer_LOD_Apply(this);
 +              CSQCPlayer_LOD_Apply(this, true);
  
                if(!isplayer)
                {

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/common/turrets/sv_turrets.qc
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
index dfb09f0ac4b09cb8ee06cd2fa9e85d945faafa1c,e994491121a8ae1bf012f6981d7c8fdbc1a7a465..601db5481499c85bc787003e774bf23036fdf217
--- 1/qcsrc/menu/xonotic/util.qc
--- 2/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@@ -689,6 -689,8 +689,7 @@@ float updateCompression(
        GAMETYPE(MAPINFO_TYPE_NEXBALL) \
        GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
        GAMETYPE(MAPINFO_TYPE_ASSAULT) \
 -      /* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
+       /* GAMETYPE(MAPINFO_TYPE_DUEL) */ \
        /**/
  
  // hidden gametypes come last so indexing always works correctly

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