Merge branch 'master' into terencehill/newpanelhud

Conflicts:
	qcsrc/client/View.qc
	qcsrc/client/hud.qc

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

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

diff --cc qcsrc/client/hud.qc
index 8ba5ab8f7b19bd1e85596dc547fb9a0924469907,971a791aad847ac58625919380c4b6e81412cba9..2d7d8732b269468156b4470e0934756af371a779
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -2644,9 -2592,12 +2644,12 @@@ void HUD_KillNotify(string s1, string s
  {
        float w;
        float alsoprint, gentle;
 -      alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
 -      gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
 +      alsoprint = (cvar("hud_panel_notify_print") || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
 +      gentle = (cvar("cl_gentle") || cvar("cl_gentle_messages"));
        
+       if ((msg == MSG_SUICIDE || msg == MSG_KILL || msg == MSG_KILL_ACTION) && gametype == GAME_CTS) // selfkill isn't interesting in CTS and only spams up the notify panel
+               return;
+ 
        if(msg == MSG_SUICIDE) {
                w = DEATH_WEAPONOF(type);
                if(WEP_VALID(w)) {
@@@ -3836,16 -3835,9 +3877,22 @@@ void HUD_VoteWindow(void
        if(!vote_alpha)
                return;
  
 -      a = panel_bg_alpha * vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1);
 +      active_panel = HUD_PANEL_VOTE;
 +      HUD_Panel_UpdateCvars(vote);
 +      vector pos, mySize;
 +      pos = panel_pos;
 +      mySize = panel_size;
 +
++      if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE))
++      {
++              panel_pos = eX * 0.3 * vid_conwidth + eY * 0.1 * vid_conheight;
++              panel_size = eX * 0.4 * vid_conwidth + eY * 0.3 * vid_conheight;
++      }
++
 +      a = vote_alpha * bound(cvar("hud_panel_vote_alreadyvoted_alpha"), 1 - vote_highlighted, 1);
        HUD_Panel_DrawBg(a);
 -      a = panel_fg_alpha * vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1);
 +      a = panel_fg_alpha * a;
 +
        if(panel_bg_padding)
        {
                pos += '1 1 0' * panel_bg_padding;
@@@ -5003,6 -5000,10 +5056,7 @@@ switch (id) {
  
  void HUD_Main (void)
  {
 -
 -      hud_skin_path = strcat("gfx/hud/", autocvar_hud_skin);
 -
+       float i;
        // global hud alpha fade
        if(menu_enabled == 1)
                hud_fade_alpha = 1;

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