Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud

diff --combined qcsrc/client/hud.qc
index 0b0bae8029f3e0699c673ef9de23a33904ca450a,1cbed12940df793a0bc56f3626c34931872b9010..7d87df8f7d347649848ac8db2f76e6396d424cc8
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -1166,19 -1166,6 +1166,19 @@@ float HUD_Panel_InputEvent(float bInput
        if(!hud_configure)
                return false;
  
 +      // allow console bind to work
 +      string con_keys;
 +      float keys;
 +      con_keys = findkeysforcommand("toggleconsole");
 +      keys = tokenize(con_keys);
 +
 +      float hit_con_bind, i;
 +      for (i = 0; i < keys; ++i)
 +      {
 +              if(nPrimary == stof(argv(i)))
 +                      hit_con_bind = 1;
 +      }
 +
        prevMouseClicked = mouseClicked;
        if(nPrimary == K_MOUSE1)
        {
@@@ -1192,11 -1179,10 +1192,13 @@@
                }
        }
        else if(nPrimary == K_ESCAPE)
-               cvar_set("_hud_configure", "0");
+       {
+               localcmd("menu_showhudexit\n");
+       }
  
 +      else if(hit_con_bind)
 +              return false;
 +
        return true; // Suppress ALL other input
  }
  
@@@ -3961,8 -3947,4 +3963,8 @@@ void HUD_Main (void
                HUD_ShowSpeed();
        if (cvar("cl_showacceleration"))
                HUD_ShowAcceleration();
 +
 +      if (hud_configure && spectatee_status) // try to join if we are in hud_configure mode, but still spectating (in order to get rid of motd and such)
 +              localcmd("cmd selectteam auto; cmd join\n");
 +
  }