Merge remote-tracking branch 'origin/master' into samual/fix_deathfade

[xonotic/xonotic-data.pk3dir.git] / crosshairs.cfg

diff --git a/crosshairs.cfg b/crosshairs.cfg
index 7f0db53e4c68c00ab1b70085d4615e127e9ea8f0..e02e7c2e2ebe50949338d03c0794e6187a174813 100644 (file)
--- a/crosshairs.cfg
+++ b/crosshairs.cfg
@@ -17,7 +17,7 @@ seta crosshair_dot_color "1 0 0"
 seta crosshair_dot_color_custom 1 "use a custom color for the crosshair dot"
 
 // smooth transitions for crosshair changes
-seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
+seta crosshair_effect_time 0.4 "how fast (in seconds) some crosshair effects should take place, 0 = instant"
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 
 // item pickup animation settings
@@ -39,7 +39,7 @@ seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact loc
 // change color based on special case
 seta crosshair_color_special 1 "special color handling for crosshair... 1 = per-weapon crosshair color (see crosshair_per_weapon), 2 = crosshair changes color based on health, 3 = rainbow/random color selection"
 seta crosshair_color_special_rainbow_delay 0.1
-seta crosshair_color_special_rainbow_brightness 2 "color brightness of the random crosshair colors"
+seta crosshair_color_special_rainbow_brightness 20 "color brightness of the random crosshair colors"
 
 
 // ===============================