Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/_hud_common.cfg b/_hud_common.cfg
index 41ffcf9eed4b4def46fc308fc2689a7ae96fa825..c486afb4ba284c4f986d6e730b2b0fd07332fb4e 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -23,6 +23,7 @@ seta hud_colorset_background "7" "neutral/unimportant text"
 seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_cells 180 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_plasma 180 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_rockets 160 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count"
 
@@ -37,9 +38,20 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averag
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
 
-seta hud_panel_quickmenu_file quickmenu.txt "load the quick menu from this file"
+seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value"
+seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen"
+
+seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full"
+seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"
+seta hud_panel_itemstime_hidelarge "0" "if 1 hide large armor and health from the panel"
+
+seta hud_panel_quickmenu_file "" "load the quick menu from this file (empty or 0 to disable)"
+seta hud_panel_quickmenu_translatecommands 0 "when the game is translated, translate strings inside commands too (useful for chat commands)"
+seta hud_panel_quickmenu_time 5 "quickmenu expires after this number of seconds in the same page"
 
 // hud panel aliases
+alias quickmenu "cl_cmd hud quickmenu ${* ?}"
+
 alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
 alias +hud_panel_radar_maximized "cl_cmd hud radar 1"
 alias -hud_panel_radar_maximized "cl_cmd hud radar 0"