From: terencehill Date: Fri, 8 Jan 2021 13:41:04 +0000 (+0100) Subject: Scoreboard: allow changing eliminated highlight alpha (hud_panel_scoreboard_table_hig... X-Git-Tag: xonotic-v0.8.5~604 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92b14519817ebce85c4575ed04287b61b3c4569a;p=xonotic%2Fxonotic-data.pk3dir.git Scoreboard: allow changing eliminated highlight alpha (hud_panel_scoreboard_table_highlight_alpha_eliminated) --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 6880f96e0..4bb0582cf 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -375,6 +375,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "" "self foreground alpha of a sco seta hud_panel_scoreboard_table_highlight "" "enable highlighting for rows and columns in scoreboard tables" seta hud_panel_scoreboard_table_highlight_alpha "" "highlight alpha of a scoreboard table" seta hud_panel_scoreboard_table_highlight_alpha_self "" "self highlight alpha of a scoreboard table" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "" "eliminated highlight alpha of a scoreboard table" seta hud_panel_scoreboard_bg_teams_color_team "" "override panel team color in team tables" seta hud_panel_scoreboard_accuracy_doublerows "" "use two rows instead of one" seta hud_panel_scoreboard_accuracy_nocolors "" "don't use colors displaying accuracy stats" diff --git a/hud_luma.cfg b/hud_luma.cfg index 747736b26..0ae785b71 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -376,6 +376,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "1" seta hud_panel_scoreboard_table_highlight "1" seta hud_panel_scoreboard_table_highlight_alpha "0.2" seta hud_panel_scoreboard_table_highlight_alpha_self "0.4" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "0.6" seta hud_panel_scoreboard_bg_teams_color_team "0" seta hud_panel_scoreboard_accuracy_doublerows "0" seta hud_panel_scoreboard_accuracy_nocolors "0" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 3a02780b6..f34ba0e23 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -376,6 +376,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "1" seta hud_panel_scoreboard_table_highlight "1" seta hud_panel_scoreboard_table_highlight_alpha "0.08" seta hud_panel_scoreboard_table_highlight_alpha_self "0.3" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "0.5" seta hud_panel_scoreboard_bg_teams_color_team "0" seta hud_panel_scoreboard_accuracy_doublerows "1" seta hud_panel_scoreboard_accuracy_nocolors "0" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 80642d6fe..0756e2539 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -376,6 +376,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "1" seta hud_panel_scoreboard_table_highlight "1" seta hud_panel_scoreboard_table_highlight_alpha "0.08" seta hud_panel_scoreboard_table_highlight_alpha_self "0.3" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "0.5" seta hud_panel_scoreboard_bg_teams_color_team "0.7" seta hud_panel_scoreboard_accuracy_doublerows "1" seta hud_panel_scoreboard_accuracy_nocolors "0" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index 31abc94cf..53287c16f 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -376,6 +376,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "1" seta hud_panel_scoreboard_table_highlight "1" seta hud_panel_scoreboard_table_highlight_alpha "0.08" seta hud_panel_scoreboard_table_highlight_alpha_self "0.3" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "0.5" seta hud_panel_scoreboard_bg_teams_color_team "0.7" seta hud_panel_scoreboard_accuracy_doublerows "1" seta hud_panel_scoreboard_accuracy_nocolors "0" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index d53902eac..f30c21064 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -376,6 +376,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "1" seta hud_panel_scoreboard_table_highlight "1" seta hud_panel_scoreboard_table_highlight_alpha "0.08" seta hud_panel_scoreboard_table_highlight_alpha_self "0.3" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "0.5" seta hud_panel_scoreboard_bg_teams_color_team "0.7" seta hud_panel_scoreboard_accuracy_doublerows "1" seta hud_panel_scoreboard_accuracy_nocolors "0" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index b820ef524..fc87b8201 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -376,6 +376,7 @@ seta hud_panel_scoreboard_table_fg_alpha_self "1" seta hud_panel_scoreboard_table_highlight "1" seta hud_panel_scoreboard_table_highlight_alpha "0.1" seta hud_panel_scoreboard_table_highlight_alpha_self "0.25" +seta hud_panel_scoreboard_table_highlight_alpha_eliminated "0.5" seta hud_panel_scoreboard_bg_teams_color_team "0.7" seta hud_panel_scoreboard_accuracy_doublerows "1" seta hud_panel_scoreboard_accuracy_nocolors "0" diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 5821dc469..d9c4d2bed 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -29,6 +29,7 @@ void Scoreboard_Draw_Export(int fh) HUD_Write_Cvar("hud_panel_scoreboard_table_highlight"); HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha"); HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha_self"); + HUD_Write_Cvar("hud_panel_scoreboard_table_highlight_alpha_eliminated"); HUD_Write_Cvar("hud_panel_scoreboard_bg_teams_color_team"); HUD_Write_Cvar("hud_panel_scoreboard_accuracy_doublerows"); HUD_Write_Cvar("hud_panel_scoreboard_accuracy_nocolors"); @@ -51,6 +52,7 @@ float sbt_fg_alpha_self; bool sbt_highlight; float sbt_highlight_alpha; float sbt_highlight_alpha_self; +float sbt_highlight_alpha_eliminated; // provide basic panel cvars to old clients // TODO remove them after a future release (0.8.2+) @@ -73,6 +75,7 @@ float autocvar_hud_panel_scoreboard_table_fg_alpha_self = 1; bool autocvar_hud_panel_scoreboard_table_highlight = true; float autocvar_hud_panel_scoreboard_table_highlight_alpha = 0.2; float autocvar_hud_panel_scoreboard_table_highlight_alpha_self = 0.4; +float autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated = 0.6; float autocvar_hud_panel_scoreboard_bg_teams_color_team = 0; float autocvar_hud_panel_scoreboard_namesize = 15; float autocvar_hud_panel_scoreboard_team_size_position = 0; @@ -933,7 +936,7 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i } if(pl.eliminated) - drawfill(h_pos, h_size, '0 0 0', 0.5 * panel_fg_alpha, DRAWFLAG_NORMAL); + drawfill(h_pos, h_size, '0 0 0', sbt_highlight_alpha_eliminated, DRAWFLAG_NORMAL); } vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity ignored_pl, entity pl, int pl_number) @@ -1033,7 +1036,7 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity { h_size.x = column_width + hud_fontsize.x * 0.25; h_size.y = hud_fontsize.y; - drawfill(pos - hud_fontsize.x * 0.25 * eX, h_size, '0 0 0', 0.5 * panel_fg_alpha, DRAWFLAG_NORMAL); + drawfill(pos - hud_fontsize.x * 0.25 * eX, h_size, '0 0 0', sbt_highlight_alpha_eliminated, DRAWFLAG_NORMAL); } pos.x += column_width; pos.x += hud_fontsize.x; @@ -1588,6 +1591,7 @@ void Scoreboard_Draw() sbt_highlight = autocvar_hud_panel_scoreboard_table_highlight; sbt_highlight_alpha = autocvar_hud_panel_scoreboard_table_highlight_alpha * panel_fg_alpha; sbt_highlight_alpha_self = autocvar_hud_panel_scoreboard_table_highlight_alpha_self * panel_fg_alpha; + sbt_highlight_alpha_eliminated = autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated * panel_fg_alpha; sbt_fg_alpha = autocvar_hud_panel_scoreboard_table_fg_alpha * panel_fg_alpha; sbt_fg_alpha_self = autocvar_hud_panel_scoreboard_table_fg_alpha_self * panel_fg_alpha;