From: Rudolf Polzer Date: Wed, 22 Dec 2010 19:48:13 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview^0 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6ae67162d032e07c05b798721d417711f2d067c7;hp=aa4045c7ec9d93aa0e1278eb284f40ef7a4d0704 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index b26988d104..81740dfe89 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1422,7 +1422,7 @@ seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. seta hud_colorflash_alpha 0.5 "starting alpha of the color flash" -seta hud_damage 1 "an improved version of gl_polyblend, draw an image instead when hurt" +seta hud_damage 0.55 "an improved version of gl_polyblend, draw an image instead when hurt" seta hud_damage_gentle_alpha_multiplier 0.25 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version" seta hud_damage_gentle_color "1 0.7 1" "color of flash for cl_gentle version" seta hud_damage_color "1 0 0" "color of flash"