From: terencehill Date: Mon, 16 Nov 2015 19:58:32 +0000 (+0100) Subject: Make 2 hud skin cvars into user cvars (hud_panel_timer_increment and hud_panel_physic... X-Git-Tag: xonotic-v0.8.2~1650^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=380389ae30e9c9edccbae287d690f417bb9a634e;p=xonotic%2Fxonotic-data.pk3dir.git Make 2 hud skin cvars into user cvars (hud_panel_timer_increment and hud_panel_physics_speed_unit) so that they remain the same when loading another skin --- diff --git a/_hud_common.cfg b/_hud_common.cfg index c486afb4b..70900762f 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -34,12 +34,15 @@ seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the ar seta hud_panel_healtharmor_progressbar_gfx_damage 5 "show damage effect when damaged at least by this amount; 0 disables the effect" seta hud_panel_healtharmor_progressbar_gfx_lowhealth 40 "health progressbar blinks when health is lower than this amount" +seta hud_panel_timer_increment "0" "show elapsed time instead of remaining time" + seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value" seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen" +seta hud_panel_physics_speed_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)" seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full" seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again" diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index c882738b2..970d6ff7f 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -142,7 +142,6 @@ seta hud_panel_timer_bg_color_team "" "override panel color with team color in t seta hud_panel_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" seta hud_panel_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" -seta hud_panel_timer_increment "" "show elapsed time instead of remaining time" seta hud_panel_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes" seta hud_panel_radar_pos "" "position of this base of the panel" @@ -271,7 +270,6 @@ seta hud_panel_physics_acceleration_progressbar_nonlinear "" "use a non linear f 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_text_scale "" "scale text height by this factor" -seta hud_panel_physics_speed_unit "" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots)" seta hud_panel_physics_speed_unit_show "" "also show speed unit" seta hud_panel_physics_speed_max "" "speed progressbar gets filled up completely by this value (in qu/s)" seta hud_panel_physics_speed_vertical "" "include the speed on the Z-axis" diff --git a/hud_luma.cfg b/hud_luma.cfg index efc6ccf8e..0c15c62c9 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -140,7 +140,6 @@ seta hud_panel_timer_bg_color_team "" seta hud_panel_timer_bg_alpha "" seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" -seta hud_panel_timer_increment "0" seta hud_panel_radar 1 seta hud_panel_radar_pos "0 0" @@ -259,7 +258,6 @@ seta hud_panel_physics_bg_color_team "" seta hud_panel_physics_bg_alpha "0.700000" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" -seta hud_panel_physics_speed_unit "1" seta hud_panel_physics_speed_unit_show "1" seta hud_panel_physics_speed_max "1800" seta hud_panel_physics_speed_vertical "0" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 9f9afdd8b..0ac6ad251 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -140,7 +140,6 @@ seta hud_panel_timer_bg_color_team "" seta hud_panel_timer_bg_alpha "" seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" -seta hud_panel_timer_increment "0" seta hud_panel_radar 2 seta hud_panel_radar_pos "0 0" @@ -259,7 +258,6 @@ seta hud_panel_physics_bg_color_team "" seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" -seta hud_panel_physics_speed_unit "3" seta hud_panel_physics_speed_unit_show "1" seta hud_panel_physics_speed_max "1800" seta hud_panel_physics_speed_vertical "0" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 97d39ee5b..c4d0d63be 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -140,7 +140,6 @@ seta hud_panel_timer_bg_color_team "" seta hud_panel_timer_bg_alpha "" seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" -seta hud_panel_timer_increment "0" seta hud_panel_radar 2 seta hud_panel_radar_pos "0.810000 0" @@ -259,7 +258,6 @@ seta hud_panel_physics_bg_color_team "" seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" -seta hud_panel_physics_speed_unit "3" seta hud_panel_physics_speed_unit_show "1" seta hud_panel_physics_speed_max "1800" seta hud_panel_physics_speed_vertical "0" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index cd777e1d2..f4e3d6e28 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -140,7 +140,6 @@ seta hud_panel_timer_bg_color_team "" seta hud_panel_timer_bg_alpha "" seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" -seta hud_panel_timer_increment "0" seta hud_panel_radar 2 seta hud_panel_radar_pos "0.810000 0" @@ -259,7 +258,6 @@ seta hud_panel_physics_bg_color_team "" seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" -seta hud_panel_physics_speed_unit "3" seta hud_panel_physics_speed_unit_show "1" seta hud_panel_physics_speed_max "1800" seta hud_panel_physics_speed_vertical "0" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index 0496ba9ae..a44323502 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -140,7 +140,6 @@ seta hud_panel_timer_bg_color_team "" seta hud_panel_timer_bg_alpha "" seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" -seta hud_panel_timer_increment "0" seta hud_panel_radar 2 seta hud_panel_radar_pos "0.030000 0.020000" @@ -259,7 +258,6 @@ seta hud_panel_physics_bg_color_team "" seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" -seta hud_panel_physics_speed_unit "3" seta hud_panel_physics_speed_unit_show "1" seta hud_panel_physics_speed_max "1800" seta hud_panel_physics_speed_vertical "0" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index b520b776c..b97b42882 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -140,7 +140,6 @@ seta hud_panel_timer_bg_color_team "" seta hud_panel_timer_bg_alpha "" seta hud_panel_timer_bg_border "" seta hud_panel_timer_bg_padding "0" -seta hud_panel_timer_increment "0" seta hud_panel_radar 2 seta hud_panel_radar_pos "0 0" @@ -259,7 +258,6 @@ seta hud_panel_physics_bg_color_team "" seta hud_panel_physics_bg_alpha "" seta hud_panel_physics_bg_border "" seta hud_panel_physics_bg_padding "" -seta hud_panel_physics_speed_unit "1" seta hud_panel_physics_speed_unit_show "0" seta hud_panel_physics_speed_max "1800" seta hud_panel_physics_speed_vertical "0" diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index 6b05078d5..6bb871dab 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -127,7 +127,6 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_icon_aspect"); break; case HUD_PANEL_TIMER: - HUD_Write_PanelCvar_q("_increment"); break; case HUD_PANEL_RADAR: HUD_Write_PanelCvar_q("_foreground_alpha"); @@ -162,7 +161,6 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_flip"); break; case HUD_PANEL_PHYSICS: - HUD_Write_PanelCvar_q("_speed_unit"); HUD_Write_PanelCvar_q("_speed_unit_show"); HUD_Write_PanelCvar_q("_speed_max"); HUD_Write_PanelCvar_q("_speed_vertical");