From: Samual Lenks <samual@xonotic.org>
Date: Wed, 26 Feb 2014 21:00:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~57
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f8287888da112f1cd5d711903be8f840ff9f0d70;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
	mutators.cfg
	qcsrc/common/items.qh
---

f8287888da112f1cd5d711903be8f840ff9f0d70
diff --cc qcsrc/client/hud.qc
index 41805d18e,bb5eb4a68..a6d06d783
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -922,9 -966,10 +924,10 @@@ void HUD_Ammo(void
  		mySize -= '2 2 0' * panel_bg_padding;
  	}
  
+ 	const float AMMO_COUNT = 4;
  	float rows = 0, columns, row, column;
  	vector ammo_size;
 -	if (autocvar_hud_panel_ammo_onlycurrent)
 +	if(autocvar_hud_panel_ammo_onlycurrent)
  		ammo_size = mySize;
  	else
  	{