From: z411 Date: Fri, 18 Mar 2022 19:18:59 +0000 (-0300) Subject: Adjusted font sizes to keep skins the same X-Git-Tag: xonotic-v0.8.5~128^2~18 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=02d30f417b037943691a16c6c3f741ae6bb15ca4;p=xonotic%2Fxonotic-data.pk3dir.git Adjusted font sizes to keep skins the same --- diff --git a/hud_luma.cfg b/hud_luma.cfg index 0dc4fe8d1..68cc7625a 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -273,9 +273,9 @@ seta hud_panel_centerprint_bg_border "" seta hud_panel_centerprint_bg_padding "" seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" -seta hud_panel_centerprint_fontscale "1.4" -seta hud_panel_centerprint_fontscale_bold "2" -seta hud_panel_centerprint_fontscale_title "2.5" +seta hud_panel_centerprint_fontscale "1" +seta hud_panel_centerprint_fontscale_bold "1.4" +seta hud_panel_centerprint_fontscale_title "1.8" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 4b862b37a..b0e0e409c 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -275,6 +275,7 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" +seta hud_panel_centerprint_fontscale_title "1.8" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 1da5ad1ee..1f2280bc8 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -275,6 +275,7 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" +seta hud_panel_centerprint_fontscale_title "1.8" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index 056160bee..76377a22d 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -275,6 +275,7 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" +seta hud_panel_centerprint_fontscale_title "1.8" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index b71d44cea..121f196dd 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -275,6 +275,7 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" +seta hud_panel_centerprint_fontscale_title "1.8" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 78b69a72f..919ba39a2 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -275,6 +275,7 @@ seta hud_panel_centerprint_align "0.5" seta hud_panel_centerprint_flip "0" seta hud_panel_centerprint_fontscale "1" seta hud_panel_centerprint_fontscale_bold "1.4" +seta hud_panel_centerprint_fontscale_title "1.8" seta hud_panel_minigameboard_pos "0.22 0.15" seta hud_panel_minigameboard_size "0.50 0.60" diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index abc53c0c4..a8ac62937 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -262,7 +262,7 @@ void HUD_CenterPrint() // Show title if available if(centerprint_title_show) { - vector fontsize = hud_fontsize * autocvar_hud_panel_centerprint_fontscale_title; + vector fontsize = hud_fontsize * 1.5 * autocvar_hud_panel_centerprint_fontscale_title; float width = stringwidth(centerprint_title, true, fontsize); pos.x = panel_pos.x + (panel_size.x - width) * align; @@ -276,9 +276,9 @@ void HUD_CenterPrint() drawfill(pos, vec2(width, 1), '1 1 1', 1, DRAWFLAG_NORMAL); if (autocvar_hud_panel_centerprint_flip) - pos.y -= hud_fontsize.y * CENTERPRINT_TITLE_SPACING / 2; + pos.y -= hud_fontsize.y * 1.5 * (CENTERPRINT_TITLE_SPACING / 2); else - pos.y += hud_fontsize.y * CENTERPRINT_TITLE_SPACING / 2; + pos.y += hud_fontsize.y * 1.5 * (CENTERPRINT_TITLE_SPACING / 2); all_messages_expired = false; } @@ -367,7 +367,7 @@ void HUD_CenterPrint() while(getWrappedLine_remaining) { bool is_bold = (substring(getWrappedLine_remaining, 0, 5) == BOLD_OPERATOR); - vector fontsize = hud_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale); + vector fontsize = hud_fontsize * 1.5 * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale); ts = getWrappedLine(panel_size.x * hud_scale.x * sz, fontsize, stringwidth_colors); if (ts != "") @@ -385,7 +385,7 @@ void HUD_CenterPrint() getWrappedLine_remaining = argv(k); bool is_bold = (substring(getWrappedLine_remaining, 0, 5) == BOLD_OPERATOR); - vector fontsize = hud_fontsize * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale); + vector fontsize = hud_fontsize * 1.5 * (is_bold ? autocvar_hud_panel_centerprint_fontscale_bold : autocvar_hud_panel_centerprint_fontscale); if (is_bold) getWrappedLine_remaining = substring(getWrappedLine_remaining, 5, -1); diff --git a/qcsrc/client/hud/panel/centerprint.qh b/qcsrc/client/hud/panel/centerprint.qh index 4a96d40c1..3bb3e52cd 100644 --- a/qcsrc/client/hud/panel/centerprint.qh +++ b/qcsrc/client/hud/panel/centerprint.qh @@ -14,9 +14,9 @@ float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha = 0.5; float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75; float autocvar_hud_panel_centerprint_fade_minfontsize = 1; bool autocvar_hud_panel_centerprint_flip; -float autocvar_hud_panel_centerprint_fontscale = 1.4; -float autocvar_hud_panel_centerprint_fontscale_bold = 2; -float autocvar_hud_panel_centerprint_fontscale_title = 2.5; +float autocvar_hud_panel_centerprint_fontscale = 1; +float autocvar_hud_panel_centerprint_fontscale_bold = 1.4; +float autocvar_hud_panel_centerprint_fontscale_title = 1.8; bool autocvar_hud_panel_centerprint_dynamichud = true; float autocvar_hud_panel_centerprint_time;