]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Tue, 5 Jul 2011 16:09:08 +0000 (18:09 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 5 Jul 2011 16:09:08 +0000 (18:09 +0200)
Conflicts:
qcsrc/client/scoreboard.qc

1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/scoreboard.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_keyhunt.qc

Simple merge
Simple merge
Simple merge
index 8d2436d100019623d91e581bd58844cfeaa2ff5a,37ace81a322ef33aaebcfc8831d3935e5bcd3145..2d32083d311f51e49cbe635e35ffb0787311b889
@@@ -1162,9 -1165,14 +1165,11 @@@ void HUD_DrawScoreboard(
        pos_z = 0;
  
        // Heading
-       drawstring(pos, _("Scoreboard"), '24 24 0', '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       vector sb_heading_fontsize;
+       sb_heading_fontsize = hud_fontsize * 2;
+       drawstring(pos, _("Scoreboard"), sb_heading_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 -      
 -      centerprint_start_x = vid_conwidth - 0.5 * (pos_x + stringwidth(_("Scoreboard"), FALSE, sb_heading_fontsize));
 -      centerprint_start_y = pos_y;
  
-       pos_y += 24;
+       pos_y += sb_heading_fontsize_y + hud_fontsize_y * 0.25;
  
        // Draw the scoreboard
        vector bg_size = drawgetimagesize("gfx/scoreboard/scoreboard_bg") * autocvar_scoreboard_bg_scale;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge