Merge branch 'master' into terencehill/newpanelhud

Conflicts:
	qcsrc/client/hud.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Defs.qc
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 177a7cb9857695ae2ba00e00645c6df2155ce4dc,1053c5e5ff5178c2dfff9035f0b5d2a8cb5239a7..9252d5b5966973df82e0b1117e45ea578b0fed08
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -2972,21 -3888,16 +2972,21 @@@ void HUD_VoteWindow(void
        if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE))
        {
                vote_active = 1;
-               vote_called_vote = strzone(_("^2Name ^7instead of \"^1Unregistered player\" ^7in stats"));
 +              if (autocvar__hud_configure)
 +              {
 +                      vote_yescount = 0;
 +                      vote_nocount = 0;
 +                      print(_("^1You must answer before entering hud configure mode\n"));
 +                      cvar_set("_hud_configure", "0");
 +              }
 -        uid2name_dialog = 1;
+               vote_called_vote = strzone(_("^2Name ^7instead of \"^1Unregistered player^7\" in stats"));
 +              uid2name_dialog = 1;
        }
  
 -      if(!autocvar_hud_panel_vote && !autocvar__hud_configure)
 -              return;
 -
        if(!autocvar__hud_configure)
        {
 +              if(!autocvar_hud_panel_vote) return;
 +
                panel_fg_alpha = autocvar_hud_panel_fg_alpha;
                panel_bg_alpha_str = autocvar_hud_panel_vote_bg_alpha;
  

diff --cc qcsrc/common/constants.qh
Simple merge

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

diff --cc tooltips.db
Simple merge