Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:00:14 +0000 (16:00 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:00:14 +0000 (16:00 -0500)
Conflicts:
mutators.cfg
qcsrc/common/items.qh

1  2 
mutators.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_nades.qc

diff --cc mutators.cfg
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
        {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge