Merge branch 'master' into Mario/quickmenu_merge

[xonotic/xonotic-data.pk3dir.git] / _hud_descriptions.cfg

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 6ca17d73fa09e58d115337f87a0aeaedf2dec7af..48e1f0352a753ca9adab27a3c7c39e29d83d5270 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -167,7 +167,7 @@ seta hud_panel_score_bg_color_team "" "override panel color with team color in t
 seta hud_panel_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_panel_score_rankings "" "show rankings: 1 always show my own score; 2 pure rankings" 
+seta hud_panel_score_rankings "" "show rankings: 1 always show my own score; 2 pure rankings"
 
 seta hud_panel_racetimer "" "enable/disable this panel"
 seta hud_panel_racetimer_pos "" "position of this base of the panel"
@@ -199,7 +199,9 @@ seta hud_panel_modicons_bg_color_team "" "override panel color with team color i
 seta hud_panel_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_modicons_ca_layout "" "2 possible layouts: 0) number of alive players; 1) icons and number of alive players"
 seta hud_panel_modicons_dom_layout "" "3 possible layouts: 0) only icons; 1) icons and percentage of average pps (points per second); 2) icons and average pps"
+seta hud_panel_modicons_freezetag_layout "" "2 possible layouts: 0) number of alive players; 1) icons and number of alive players"
 
 seta hud_panel_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
 seta hud_panel_pressedkeys_pos "" "position of this base of the panel"