From: terencehill Date: Mon, 26 Jun 2017 15:04:56 +0000 (+0200) Subject: Update hud config exporter, fix _hud_panelorder in the config files X-Git-Tag: xonotic-v0.8.5~2686 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ece2d965289216545f31096fa0503a6148e3bbf;p=xonotic%2Fxonotic-data.pk3dir.git Update hud config exporter, fix _hud_panelorder in the config files --- diff --git a/hud_luma.cfg b/hud_luma.cfg index 5ebdeaeec..40577ff91 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -29,7 +29,7 @@ seta hud_progressbar_acceleration_neg_color "0.86 0.35 0" seta hud_progressbar_vehicles_ammo1_color "0.77 0.67 0" seta hud_progressbar_vehicles_ammo2_color "0.86 0.35 0" -seta _hud_panelorder "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 18 23 19 20 21 22 23 24 " +seta _hud_panelorder "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 18 23 19 20 21 22 24 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.005000" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 8f64ddebb..3f4fe39fa 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -29,7 +29,7 @@ seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" -seta _hud_panelorder "17 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 18 23 19 20 21 22 23 24 " +seta _hud_panelorder "17 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 18 23 19 20 21 22 24 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 31926d2f5..609ab766d 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -29,7 +29,7 @@ seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" -seta _hud_panelorder "17 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 18 23 19 20 21 22 23 24 " +seta _hud_panelorder "17 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 18 23 19 20 21 22 24 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index ae786574f..4159b01c7 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -29,7 +29,7 @@ seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" -seta _hud_panelorder "17 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 18 23 19 20 21 22 23 24 " +seta _hud_panelorder "17 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 18 23 19 20 21 22 24 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index 64b951e96..073b2d0f7 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -95,6 +95,8 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar("hud_panel_weapons_onlyowned"); HUD_Write_Cvar("hud_panel_weapons_noncurrent_alpha"); HUD_Write_Cvar("hud_panel_weapons_noncurrent_scale"); + HUD_Write_Cvar("hud_panel_weapons_selection_radius"); + HUD_Write_Cvar("hud_panel_weapons_selection_speed"); break; case HUD_PANEL_AMMO: HUD_Write_Cvar("hud_panel_ammo_onlycurrent"); @@ -113,6 +115,7 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar("hud_panel_powerups_text"); break; case HUD_PANEL_HEALTHARMOR: + HUD_Write_Cvar("hud_panel_healtharmor_combined"); HUD_Write_Cvar("hud_panel_healtharmor_flip"); HUD_Write_Cvar("hud_panel_healtharmor_iconalign"); HUD_Write_Cvar("hud_panel_healtharmor_baralign"); @@ -121,7 +124,6 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar("hud_panel_healtharmor_progressbar_armor"); HUD_Write_Cvar("hud_panel_healtharmor_progressbar_gfx"); HUD_Write_Cvar("hud_panel_healtharmor_progressbar_gfx_smooth"); - HUD_Write_Cvar("hud_panel_healtharmor_combined"); HUD_Write_Cvar("hud_panel_healtharmor_text"); break; case HUD_PANEL_NOTIFY: @@ -206,6 +208,9 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar("hud_panel_itemstime_ratio"); HUD_Write_Cvar("hud_panel_itemstime_dynamicsize"); break; + case HUD_PANEL_MAPVOTE: + HUD_Write_Cvar("hud_panel_mapvote_highlight_border"); + break; case HUD_PANEL_QUICKMENU: HUD_Write_Cvar("hud_panel_quickmenu_align"); break;