Merge branch 'master' into Mario/vehicles

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

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 8bbe38942d196b630559e110e85b8c0f1e0a6fbd..7b6f739753e8c06ace70dd2eb5d98aedf727f4aa 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -64,6 +64,8 @@ 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"
+seta hud_panel_weapons_noncurrent_alpha "" "alpha of noncurrent weapons"
+seta hud_panel_weapons_noncurrent_scale "" "scale of noncurrent weapons, relative to the current weapon"
 
 seta hud_panel_ammo "" "enable/disable this panel"
 seta hud_panel_ammo_pos "" "position of this panel"
@@ -86,7 +88,6 @@ 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"
 seta hud_panel_powerups_size "" "size of this panel"
-seta hud_panel_powerups_flip "" "flip strength/shield positions"
 seta hud_panel_powerups_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align only left bar to the right, 3 = align only right bar to the right"
 seta hud_panel_powerups_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align only left icon to the right, 3 = align only right icon to the right"
 seta hud_panel_powerups_bg "" "if set to something else than \"\" = override default background"
@@ -96,10 +97,7 @@ 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_progressbar_superweapons "" "progressbar image for superweapons"
-seta hud_panel_powerups_text "" "show text/icons in the powerups panel"
+seta hud_panel_powerups_text "" "show text and 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"
@@ -303,12 +301,29 @@ seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "" "minimum factor t
 seta hud_panel_centerprint_fade_subsequent_minfontsize "" "minimum factor for the font size from the subsequent fading effects"
 seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading in/out effects"
 
-seta hud_panel_buffs "" "enable/disable this panel"
-seta hud_panel_buffs_pos "" "position of this panel"
-seta hud_panel_buffs_size "" "size of this panel"
-seta hud_panel_buffs_bg "" "if set to something else than \"\" = override default background"
-seta hud_panel_buffs_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_panel_buffs_bg_color_team "" "override panel color with team color in team based games"
-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_mapvote "" "enable/disable this panel"
+seta hud_panel_mapvote_pos "" "position of this panel"
+seta hud_panel_mapvote_size "" "size of this panel"
+seta hud_panel_mapvote_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_mapvote_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_mapvote_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_mapvote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_mapvote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_mapvote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_itemstime "" "enable/disable this panel, it shows left time until important items (mega health, large armor, powerups, superweapons, etc...) respawn in the map: 1 when spectating, 2 even playing in warmup stage"
+seta hud_panel_itemstime_pos "" "position of this base of the panel"
+seta hud_panel_itemstime_size "" "size of this panel"
+seta hud_panel_itemstime_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_itemstime_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_itemstime_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_itemstime_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_itemstime_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_itemstime_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_itemstime_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
+seta hud_panel_itemstime_progressbar "" "use progressbar behind icons"
+seta hud_panel_itemstime_progressbar_name "" "name of progressbar to use behind icons"
+seta hud_panel_itemstime_progressbar_reduced "" "progressbar is displayed only in the text field"
+seta hud_panel_itemstime_text "" "show text"
+seta hud_panel_itemstime_ratio "" "ratio between space reserved for text and icon width of each item entry (min value is 2)"
+seta hud_panel_itemstime_dynamicsize "" "allow panel size reduction by removing spacing among items"