From: terencehill Date: Tue, 14 Jun 2016 18:25:42 +0000 (+0200) Subject: Make the hud shake effect more subtle X-Git-Tag: xonotic-v0.8.2~805^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F325%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Make the hud shake effect more subtle --- diff --git a/_hud_common.cfg b/_hud_common.cfg index bf8fe80b6..d8c7713f1 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -111,9 +111,9 @@ seta hud_dynamic_follow_scale 0.01 "HUD following scale" seta hud_dynamic_follow_scale_xyz "1 1 1" "HUD following scale for the x, y and z axis" seta hud_dynamic_shake 1 "shake the HUD when hurt" -seta hud_dynamic_shake_damage_max 90 "damage value at which the HUD shake effect is maximum" +seta hud_dynamic_shake_damage_max 130 "damage value at which the HUD shake effect is maximum" seta hud_dynamic_shake_damage_min 10 "damage value at which the HUD shake effect is minimum" -seta hud_dynamic_shake_scale 0.4 "HUD shake scale" +seta hud_dynamic_shake_scale 0.2 "HUD shake scale" seta hud_showbinds 1 "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both" seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited" diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index ee1000755..c6cb5257b 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -387,10 +387,10 @@ void HUD_Reset() HUD_Mod_CTF_Reset(); } -float autocvar_hud_dynamic_shake; -float autocvar_hud_dynamic_shake_damage_max; -float autocvar_hud_dynamic_shake_damage_min; -float autocvar_hud_dynamic_shake_scale; +float autocvar_hud_dynamic_shake = 1; +float autocvar_hud_dynamic_shake_damage_max = 130; +float autocvar_hud_dynamic_shake_damage_min = 10; +float autocvar_hud_dynamic_shake_scale = 0.2; float hud_dynamic_shake_x[10] = {0, 1, -0.7, 0.5, -0.3, 0.2, -0.1, 0.1, 0.0, 0}; float hud_dynamic_shake_y[10] = {0, 0.4, 0.8, -0.2, -0.6, 0.0, 0.3, 0.1, -0.1, 0}; bool Hud_Shake_Update()