From: Martin Taibr Date: Tue, 9 May 2017 21:42:18 +0000 (+0200) Subject: put defaults into defaultXonotic.cfg, adjust some timings X-Git-Tag: xonotic-v0.8.5~2656^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d03a4001c11feef7c8bcc3e0a3af6c59c43c580;p=xonotic%2Fxonotic-data.pk3dir.git put defaults into defaultXonotic.cfg, adjust some timings --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 33ec16e4e..9f8e25307 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -814,6 +814,13 @@ seta cl_damagetext_accumulate_alpha_rel "0.65" "Only update existing damage text seta cl_damagetext_friendlyfire "1" "Show damage text for friendlyfire too" seta cl_damagetext_friendlyfire_color "1 0 0" "Damage text color for friendlyfire" +seta cl_damagetext_2d_pos "0.47 0.47 0" "2D damage text initial position (X and Y between 0 and 1)" +seta cl_damagetext_2d_alpha_start 1 "2D damage text initial alpha" +seta cl_damagetext_2d_alpha_lifetime 1 "2D damage text lifetime (alpha fading) in seconds" +seta cl_damagetext_2d_size_lifetime 2 "2D damage text lifetime (size shrinking) in seconds" +seta cl_damagetext_2d_velocity "-20 0 0" "2D damage text move direction (screen coordinates)" +seta cl_damagetext_2d_overlap_offset "0 -15 0" "Offset 2D damage text by this much to prevent overlapping (screen coordinates)" + seta cl_vehicles_alarm 1 "Play an alarm sound when the vehicle you are driving is heavily damaged" seta cl_vehicles_hud_tactical 1 seta cl_vehicles_hudscale 0.5 diff --git a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc index b2029a9ad..38db0e656 100644 --- a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc @@ -29,8 +29,8 @@ AUTOCVAR_SAVE(cl_damagetext_friendlyfire, bool, true, "Show da AUTOCVAR_SAVE(cl_damagetext_friendlyfire_color, vector, '1 0 0', "Damage text color for friendlyfire"); AUTOCVAR_SAVE(cl_damagetext_2d_pos, vector, '0.47 0.47 0', "2D damage text initial position (X and Y between 0 and 1)"); AUTOCVAR_SAVE(cl_damagetext_2d_alpha_start, float, 1, "2D damage text initial alpha"); -AUTOCVAR_SAVE(cl_damagetext_2d_alpha_lifetime, float, 1.5, "2D damage text lifetime (alpha fading) in seconds"); -AUTOCVAR_SAVE(cl_damagetext_2d_size_lifetime, float, 3, "2D damage text lifetime (size shrinking) in seconds"); +AUTOCVAR_SAVE(cl_damagetext_2d_alpha_lifetime, float, 1, "2D damage text lifetime (alpha fading) in seconds"); +AUTOCVAR_SAVE(cl_damagetext_2d_size_lifetime, float, 2, "2D damage text lifetime (size shrinking) in seconds"); AUTOCVAR_SAVE(cl_damagetext_2d_velocity, vector, '-20 0 0', "2D damage text move direction (screen coordinates)"); AUTOCVAR_SAVE(cl_damagetext_2d_overlap_offset, vector, '0 -15 0', "Offset 2D damage text by this much to prevent overlapping (screen coordinates)");