Merge branch 'terencehill/frozen_resurfacing' into 'master'

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

diff --git a/_hud_common.cfg b/_hud_common.cfg
index 75e8eb8d6f51a5d4ee6b94b804aea9eaac9a0d45..0479f389bed5449b3e827971b9b3470b938febb8 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -74,6 +74,7 @@ seta hud_panel_weapons_ammo_full_plasma 180 "show 100% of the status bar at this
 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"
 seta hud_panel_weapons_hide_ondeath 0 "hide this panel when dead"
+seta hud_panel_weapons_orderbyimpulse "1" "List weapons in their impulse order instead of priority"
 
 seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full"
 seta hud_panel_ammo_hide_ondeath 0 "hide this panel when dead"
@@ -117,6 +118,7 @@ seta hud_panel_scoreboard_minwidth 0.6 "minimum width of the scoreboard"
 
 seta hud_panel_scoreboard_accuracy_showdelay 2 "how long to delay displaying accuracy below the scoreboard if it's too far down"
 seta hud_panel_scoreboard_accuracy_showdelay_minpos 0.75 "delay displaying the accuracy panel only if its position is lower than this percentage of the screen height from the top"
+seta hud_panel_scoreboard_team_size_position 0 "where to show the team size (0 = do not show, 1 = left of scoreboard, 2 = right of scoreboard), will move team scores to the other side if necessary"
 
 // hud panel aliases
 alias quickmenu "cl_cmd hud quickmenu ${* ?}"
@@ -186,6 +188,7 @@ seta hud_shownames_crosshairdistance_antioverlap 0 "allow antioverlap to work as
 seta hud_shownames_self 0 "also include your own name to be shown when third person camera mode is on (chase_active/cl_eventchase)"
 seta hud_shownames_status 1 "1 = draw health/armor status of teammates"
 seta hud_shownames_statusbar_height 4 "height of status bar"
+seta hud_shownames_statusbar_highlight 1 "Always highlight values of health and armor from 0 to half status bar"
 seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name"
 seta hud_shownames_fontsize 12 "font size"
 seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always"