From 409ea2630e52902d32a6dab3b3558682a2721146 Mon Sep 17 00:00:00 2001 From: Samual Date: Wed, 26 Oct 2011 10:12:57 -0400 Subject: [PATCH] Fix some broken things with hud configs (wtf th you didn't add the cvars to hud_config.qc or defaultXonotic.cfg?) --- _hud_descriptions.cfg | 3 +-- hud_luminos.cfg | 7 ++++++- hud_luminos_minimal.cfg | 7 ++++++- hud_luminos_minimal_xhair.cfg | 7 ++++++- hud_luminos_old.cfg | 7 ++++++- hud_nexuiz.cfg | 7 ++++++- qcsrc/client/autocvars.qh | 2 +- qcsrc/client/hud.qc | 2 +- qcsrc/client/hud_config.qc | 5 +++++ 9 files changed, 38 insertions(+), 9 deletions(-) diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 71156398e..061720a84 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -254,9 +254,8 @@ seta hud_panel_physics_bg_padding "" "if set to something else than \"\" = overr seta hud_panel_physics_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align only left bar to the right, 3 = align only right bar to the right, 4 = align bars to the center" seta hud_panel_physics_flip "" "flip speed/acceleration positions" seta hud_panel_physics_progressbar "" "enable progressbar in panel (2 = only for speed; 3 = only for acceleration)" -seta hud_panel_physics_acceleration_progressbar_mode "" "0 = progressbar increases from the center to the right if the acceleration is positive, to the left if it's negative; 1 = progressbar increases from the border in the same direction for both positive and negative accelerations" seta hud_panel_physics_acceleration_max "" "acceleration progressbar gets completely filled up by this value (in g)" -seta hud_panel_physics_acceleration_mode "" "how the acceleration is displayed" +seta hud_panel_physics_acceleration_mode "" "0 = progressbar increases from the center to the right if the acceleration is positive, to the left if it's negative; 1 = progressbar increases from the border in the same direction for both positive and negative accelerations" seta hud_panel_physics_acceleration_vertical "" "include the acceleration on the Z-axis" seta hud_panel_physics_text "" "show text in panel (2 = only for speed; 3 = only for acceleration)" seta hud_panel_physics_speed_unit "" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index f04bea0b6..f32279f2b 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -19,6 +19,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_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 " @@ -83,6 +86,7 @@ seta hud_panel_powerups_baralign "3" seta hud_panel_powerups_progressbar "1" seta hud_panel_powerups_progressbar_strength "progressbar" seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.320000 0.910000" @@ -252,7 +256,8 @@ seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" seta hud_panel_physics_progressbar "1" -seta hud_panel_physics_acceleration_mode "" +seta hud_panel_physics_acceleration_mode "0" +seta hud_panel_physics_text "1" seta hud_panel_centerprint 1 seta hud_panel_centerprint_pos "0.175000 0.220000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 209578d68..52a7d96c1 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -19,6 +19,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_panelorder "10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 " @@ -83,6 +86,7 @@ seta hud_panel_powerups_baralign "1" seta hud_panel_powerups_progressbar "1" seta hud_panel_powerups_progressbar_strength "progressbar" seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.350000 0.890000" @@ -252,7 +256,8 @@ seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" seta hud_panel_physics_progressbar "3" -seta hud_panel_physics_acceleration_mode "" +seta hud_panel_physics_acceleration_mode "0" +seta hud_panel_physics_text "1" seta hud_panel_centerprint 1 seta hud_panel_centerprint_pos "0.175000 0.220000" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index 0ced4cb38..2d5e07600 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -19,6 +19,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_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 " @@ -83,6 +86,7 @@ seta hud_panel_powerups_baralign "1" seta hud_panel_powerups_progressbar "1" seta hud_panel_powerups_progressbar_strength "progressbar" seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.350000 0.380000" @@ -252,7 +256,8 @@ seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" seta hud_panel_physics_progressbar "3" -seta hud_panel_physics_acceleration_mode "" +seta hud_panel_physics_acceleration_mode "0" +seta hud_panel_physics_text "1" seta hud_panel_centerprint 1 seta hud_panel_centerprint_pos "0.175000 0.220000" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index fadc79e9d..fe7f66085 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -19,6 +19,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_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 " @@ -83,6 +86,7 @@ seta hud_panel_powerups_baralign "3" seta hud_panel_powerups_progressbar "1" seta hud_panel_powerups_progressbar_strength "progressbar" seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.330000 0.920000" @@ -252,7 +256,8 @@ seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" seta hud_panel_physics_progressbar "1" -seta hud_panel_physics_acceleration_mode "" +seta hud_panel_physics_acceleration_mode "0" +seta hud_panel_physics_text "1" seta hud_panel_centerprint 1 seta hud_panel_centerprint_pos "0.175000 0.220000" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 167674f8b..5c2138370 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -19,6 +19,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_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 " @@ -83,6 +86,7 @@ seta hud_panel_powerups_baralign "0" seta hud_panel_powerups_progressbar "0" seta hud_panel_powerups_progressbar_strength "progressbar" seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.370000 0.930000" @@ -252,7 +256,8 @@ seta hud_panel_physics_acceleration_vertical "0" seta hud_panel_physics_flip "0" seta hud_panel_physics_baralign "0" seta hud_panel_physics_progressbar "3" -seta hud_panel_physics_acceleration_mode "" +seta hud_panel_physics_acceleration_mode "0" +seta hud_panel_physics_text "1" seta hud_panel_centerprint 1 seta hud_panel_centerprint_pos "0.175000 0.260000" diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index d3f680b9a..13db0b193 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -257,7 +257,7 @@ float autocvar_hud_panel_notify_fontsize; float autocvar_hud_panel_notify_print; float autocvar_hud_panel_notify_time; float autocvar_hud_panel_physics; -float autocvar_hud_panel_physics_acceleration_progressbar_mode; +float autocvar_hud_panel_physics_acceleration_mode; float autocvar_hud_panel_physics_acceleration_max; float autocvar_hud_panel_physics_progressbar; float autocvar_hud_panel_physics_acceleration_vertical; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 23f8ccd61..7acfacb8c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4358,7 +4358,7 @@ void HUD_Physics(void) speed_baralign = (autocvar_hud_panel_physics_baralign == 2); acceleration_baralign = (autocvar_hud_panel_physics_baralign == 3); } - if (autocvar_hud_panel_physics_acceleration_progressbar_mode == 0) + if (autocvar_hud_panel_physics_acceleration_mode == 0) acceleration_baralign = 3; //override hud_panel_physics_baralign value for acceleration //draw speed diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc index 4c12c90d2..18ff119a7 100644 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@ -35,6 +35,9 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar_q("hud_progressbar_armor_color"); HUD_Write_Cvar_q("hud_progressbar_fuel_color"); HUD_Write_Cvar_q("hud_progressbar_nexball_color"); + HUD_Write_Cvar_q("hud_progressbar_speed_color"); + HUD_Write_Cvar_q("hud_progressbar_acceleration_color"); + HUD_Write_Cvar_q("hud_progressbar_acceleration_neg_color"); HUD_Write("\n"); HUD_Write_Cvar_q("_hud_panelorder"); @@ -94,6 +97,7 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_progressbar"); HUD_Write_PanelCvar_q("_progressbar_strength"); HUD_Write_PanelCvar_q("_progressbar_shield"); + HUD_Write_PanelCvar_q("_text"); break; case HUD_PANEL_HEALTHARMOR: HUD_Write_PanelCvar_q("_flip"); @@ -156,6 +160,7 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); HUD_Write_PanelCvar_q("_acceleration_mode"); + HUD_Write_PanelCvar_q("_text"); break; case HUD_PANEL_CENTERPRINT: HUD_Write_PanelCvar_q("_align"); -- 2.39.2