Merge branch 'master' into terencehill/newpanelhud

Conflicts:
	qcsrc/client/scoreboard.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/hud.qc
index 51015fe6ab631f12d6cd02d02b9447be0732e5c0,476eb607e48b6be0b28f05bba4a7aeef19d6e532..0910c7a7811281be2484eaa6bb436cff89721de8
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -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,

diff --cc qcsrc/client/scoreboard.qc
index 0896689749f2f7329d95b218a2be577f35af879c,31cdc45bfa04b4bcffe5697e0bbf47d4fcc4ccec..7de456043afd6dad71a155ffaabca3d3e9c0ebf3
--- 1/qcsrc/client/scoreboard.qc
--- 2/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@@ -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;

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