reintroduce combined health/armor display, do small fixes to showonlycurrent ammo...

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b65893b297a853cf6844bb6ae6264e28bfdbdc6e..973776b71e44555b98ab3e063a4843ac5ee36122 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1392,7 +1392,7 @@ seta hud_powerups_bg_padding "" "if set to something else than \"\" = override d
 seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
 seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
 
 seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
 seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
 

-seta hud_healtharmor 1 "enable/disable this panel"
+seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display"

 seta hud_healtharmor_pos "-0.627451 -0.066667" "position of this panel"
 seta hud_healtharmor_size "0.291174 0.066667" "size of this panel"
 seta hud_healtharmor_flip 1 "flip health/armor positions"
 seta hud_healtharmor_pos "-0.627451 -0.066667" "position of this panel"
 seta hud_healtharmor_size "0.291174 0.066667" "size of this panel"
 seta hud_healtharmor_flip 1 "flip health/armor positions"