Merge branch 'master' into Mario/quickmenu_merge

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

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index c4e2c8e3963a6b049ed384e60332188dbfcadd64..a26aadcff8dd1d98c6ada810e14b0a7cfdc88636 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -20,9 +20,9 @@ seta hud_progressbar_health_color "0.6 0 0"
 seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
-seta hud_progressbar_speed_color "1 0.75 0" 
-seta hud_progressbar_acceleration_color "0.5 0.75 1" 
-seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" 
+seta hud_progressbar_speed_color "1 0.75 0"
+seta hud_progressbar_acceleration_color "0.5 0.75 1"
+seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
 
 seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 17 "
 
@@ -54,7 +54,7 @@ seta hud_panel_weapons_ammo_alpha "1"
 seta hud_panel_weapons_aspect "2"
 seta hud_panel_weapons_timeout "1"
 seta hud_panel_weapons_timeout_effect "1"
-seta hud_panel_weapons_timeout_fadebgmin "0.4" 
+seta hud_panel_weapons_timeout_fadebgmin "0.4"
 seta hud_panel_weapons_timeout_fadefgmin "0.4"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
@@ -197,7 +197,9 @@ seta hud_panel_modicons_bg_color_team ""
 seta hud_panel_modicons_bg_alpha ""
 seta hud_panel_modicons_bg_border ""
 seta hud_panel_modicons_bg_padding "0"
+seta hud_panel_modicons_ca_layout "1"
 seta hud_panel_modicons_dom_layout "1"
+seta hud_panel_modicons_freezetag_layout "1"
 
 seta hud_panel_pressedkeys 1
 seta hud_panel_pressedkeys_pos "0.450000 0.720000"
@@ -288,7 +290,7 @@ seta hud_panel_centerprint_fade_out "0.5"
 seta hud_panel_centerprint_fade_subsequent "1"
 seta hud_panel_centerprint_fade_subsequent_passone "3"
 seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
-seta hud_panel_centerprint_fade_subsequent_passtwo "10" 
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
 seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
 seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"