Merge notes, PLEASE READ:

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

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 33d85443e37f424cb14ad6cb4b5b268df6a0d033..4255cc36c398f01ff704f00b158eae4c275f0587 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -59,6 +59,10 @@ seta hud_panel_ammo_bg_color_team "" "override panel color with team color in te
 seta hud_panel_ammo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_ammo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_ammo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_ammo_progressbar "" "use progressbar behind ammo icons"
+seta hud_panel_ammo_progressbar_xoffset "" "percentage of mySize_x to offset progressbar with"
+seta hud_panel_ammo_progressbar_name "" "name of progressbar to use behind ammo icons"
+seta hud_panel_ammo_text "" "show text/icons in the ammo panel"
 
 seta hud_panel_powerups "" "enable/disable this panel"
 seta hud_panel_powerups_pos "" "position of this panel"
@@ -73,6 +77,9 @@ seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = overri
 seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_powerups_progressbar "" "enable progressbar in panel"
+seta hud_panel_powerups_progressbar_strength "" "progressbar image for strength"
+seta hud_panel_powerups_progressbar_shield "" "progressbar image for shield"
+seta hud_panel_powerups_text "" "show text/icons in the powerups panel"
 
 seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
 seta hud_panel_healtharmor_pos "" "position of this panel"
@@ -87,6 +94,9 @@ seta hud_panel_healtharmor_bg_alpha "" "if set to something else than \"\" = ove
 seta hud_panel_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_healtharmor_progressbar "" "enable progressbar in panel"
+seta hud_panel_healtharmor_progressbar_health "" "progressbar image for health"
+seta hud_panel_healtharmor_progressbar_armor "" "progressbar image for armor"
+seta hud_panel_healtharmor_text "" "show text/icons in the healtharmor panel"
 
 seta hud_panel_notify "" "enable/disable this panel"
 seta hud_panel_notify_pos "" "position of this base of the panel"