Merge branch 'master' into terencehill/itemstime

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

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 163524c959abc1464ae752b5ecf2356c097c87b1..17ea14fbbe74143cd3f7266bb1152c12d2e51632 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"
@@ -313,6 +315,16 @@ seta hud_panel_buffs_bg_alpha "" "if set to something else than \"\" = override
 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"