Merge branch 'master' into Mario/combined_updates

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

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 7d8b0ccf9f02356814b2fb14e3431f8c96dce665..5cabda2f6b118ad5208bb1529bb0a24a62e27b25 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -58,6 +58,7 @@ seta hud_panel_weapons_timeout_fadefgmin "" "minimum alpha of the panel foregrou
 seta hud_panel_weapons_timeout_speed_in "" "speed that fading/moving onto the screen occurs"
 seta hud_panel_weapons_timeout_speed_out "" "speed that fading/moving off of the screen occurs"
 seta hud_panel_weapons_label "" "1 = show number of weapon, 2 = show bound key of weapon, 3 = show name of weapon"
+seta hud_panel_weapons_label_scale "" "scale of the weapon text label"
 seta hud_panel_weapons_accuracy "" "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars"
 seta hud_panel_weapons_ammo "" "show ammo as a status bar"
 seta hud_panel_weapons_onlyowned "" "show only owned weapons"
@@ -309,3 +310,5 @@ seta hud_panel_buffs_bg_color_team "" "override panel color with team color in t
 seta hud_panel_buffs_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_buffs_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_buffs_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_buffs_progressbar "" "use progressbar behind buff names"
+seta hud_panel_buffs_progressbar_name "" "name of progressbar to use behind buff names"