From: FruitieX Date: Mon, 13 Dec 2010 21:01:59 +0000 (+0200) Subject: make weapon panel fading/effect cvars part of the hud config files. Add to the exporter. X-Git-Tag: xonotic-v0.1.0preview~32^2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e425df71744a75b0b0f42318dec6840bc05ddac4;hp=475534078651e893a6d4d10f392b94c81780f4c8 make weapon panel fading/effect cvars part of the hud config files. Add to the exporter. --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 932e95bf9f..269b07c526 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -47,6 +47,8 @@ seta hud_panel_weapons_complainbubble_color_donthave "" "color of the complainbu seta hud_panel_weapons_complainbubble_color_unavailable "" "color of the complainbubble when showing weapon unavailable message" seta hud_panel_weapons_ammo_color "" "color of status bar" seta hud_panel_weapons_ammo_alpha "" "alpha of status bar" +seta hud_panel_weapons_timeout "" "panel disappears if you don't switch weapon for this amount of seconds" +seta hud_panel_weapons_timeout_effect "" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out" seta hud_panel_ammo "" "enable/disable this panel" seta hud_panel_ammo_pos "" "position of this panel" diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 57ae352aba..8dcaeacc93 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1388,8 +1388,6 @@ seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this seta hud_panel_weapons_ammo_full_cells 80 "show 100% of the status bar at this ammo count" seta hud_panel_weapons_ammo_full_rockets 80 "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_timeout "3" "panel disappears if you don't switch weapon for this amount of seconds" -seta hud_panel_weapons_timeout_effect "1" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out" seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index a8ed3f1e7a..a3f3ed39e5 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -45,6 +45,8 @@ seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" seta hud_panel_weapons_ammo_color "0 1 0" seta hud_panel_weapons_ammo_alpha "1" seta hud_panel_weapons_aspect "2" +seta hud_panel_weapons_timeout "3" +seta hud_panel_weapons_timeout_effect "1" seta hud_panel_ammo 1 seta hud_panel_ammo_pos "0.190000 0.920000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 8ee4ea7780..8e39416314 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -45,6 +45,8 @@ seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" seta hud_panel_weapons_ammo_color "0 1 0" seta hud_panel_weapons_ammo_alpha "1" seta hud_panel_weapons_aspect "2" +seta hud_panel_weapons_timeout "0" +seta hud_panel_weapons_timeout_effect "0" seta hud_panel_ammo 1 seta hud_panel_ammo_pos "0.650000 0.890000" diff --git a/hud_luminos_xhair_minimal.cfg b/hud_luminos_xhair_minimal.cfg index 73b08adeb1..10f7afd149 100644 --- a/hud_luminos_xhair_minimal.cfg +++ b/hud_luminos_xhair_minimal.cfg @@ -45,6 +45,8 @@ seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" seta hud_panel_weapons_ammo_color "0 1 0" seta hud_panel_weapons_ammo_alpha "1" seta hud_panel_weapons_aspect "2" +seta hud_panel_weapons_timeout "0" +seta hud_panel_weapons_timeout_effect "0" seta hud_panel_ammo 1 seta hud_panel_ammo_pos "0.450000 0.630000" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 1fcd27c923..681b7378e0 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -45,6 +45,8 @@ seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" seta hud_panel_weapons_ammo_color "0 1 0" seta hud_panel_weapons_ammo_alpha "1" seta hud_panel_weapons_aspect "2" +seta hud_panel_weapons_timeout "0" +seta hud_panel_weapons_timeout_effect "0" seta hud_panel_ammo 1 seta hud_panel_ammo_pos "0.160000 0.910000" diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 476eb607e4..c42d67fa03 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -492,6 +492,8 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_ammo_color"); HUD_Write_PanelCvar_q("_ammo_alpha"); HUD_Write_PanelCvar_q("_aspect"); + HUD_Write_PanelCvar_q("_timeout"); + HUD_Write_PanelCvar_q("_timeout_effect"); break; case HUD_PANEL_AMMO: HUD_Write_PanelCvar_q("_onlycurrent");