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

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

diff --cc mutators.cfg
Simple merge

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

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

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

diff --cc qcsrc/client/hud.qc
index 41805d18edfa57cd195790ef9afbe52aa6c04809,bb5eb4a68f534081953aa7d860c69602659d7fa3..a6d06d783bf745474c51d9e9c28e116e27d87a13
--- 1/qcsrc/client/hud.qc
--- 2/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
        {

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

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

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

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

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

diff --cc qcsrc/server/mutators/mutator_nades.qc
Simple merge