Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 15 Dec 2010 23:09:08 +0000 (00:09 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 15 Dec 2010 23:09:08 +0000 (00:09 +0100)
Conflicts:
qcsrc/client/scoreboard.qc

1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/util.qh

Simple merge
@@@ -3573,9 -3591,12 +3574,9 @@@ void HUD_Radar(void
                  f * bigsize
                + (1 - f) * normalsize;
        teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
-                 f * (mi_min + mi_max) * 0.5
+                 f * mi_center
                + (1 - f) * view_origin);
  
 -      color1 = GetPlayerColor(player_localentnum-1);
 -      rgb = GetTeamRGB(color1);
 -
        drawsetcliparea(
                pos_x,
                pos_y,
@@@ -883,8 -883,10 +883,10 @@@ float HUD_WouldDrawScoreboard() 
                return 1;
        else if (intermission == 1)
                return 1;
-       else if (spectatee_status != -1 && getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard)
 -      else if (getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS)
++      else if (spectatee_status != -1 && getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS)
                return 1;
+     else if (spectatee_status == -1)
+         return 1;
        else if (scoreboard_showscores_force)
                return 1;
        return 0;
Simple merge