From: Mario <mario@smbclan.net>
Date: Fri, 12 Oct 2018 08:14:44 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=988ea12f5b942f5f55c32f4a3c5ccc25b438e73b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters

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

988ea12f5b942f5f55c32f4a3c5ccc25b438e73b
diff --cc qcsrc/client/csqcmodel_hooks.qc
index 071bf614e7,522859c8b1..b5e0ff5d5d
--- a/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/menu/xonotic/util.qc
index dfb09f0ac4,e994491121..601db54814
--- a/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_DUEL) */ \
 -	/* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
  	/**/
  
  // hidden gametypes come last so indexing always works correctly