Merge remote branch 'origin/master' into terencehill/essential_weapons_panel

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc qcsrc/client/hud.qc
index 3d9056789f49348c1089da1290e4a7a80101e35c,6b11719567d055e4234fd81ddb8344f3ba4316e8..7a0c1a0f897f6c8c17c5ce8f0af5275cd60ce0a9
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -612,9 -612,9 +612,9 @@@ float GetAmmoTypeForWep(float i
  
  void HUD_Weapons(void)
  {
 -      float f, screen_ar;
 +      float i, f, screen_ar;
        float center_x, center_y;
- 
+     if(hud != HUD_NORMAL) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_weapons) return;