Merge remote-tracking branch 'origin/samual/serverlist'

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

diff --git a/crosshairs.cfg b/crosshairs.cfg
index 655e90a21b7f43c18e3eecf78dbc875906556bd5..c6a9e837b044ecb390bee079c8a811d475506454 100644 (file)
--- a/crosshairs.cfg
+++ b/crosshairs.cfg
@@ -10,14 +10,14 @@ seta crosshair_alpha 0.75
 seta crosshair_size 0.3
 
 // crosshair dot settings
-seta crosshair_dot 0 
+seta crosshair_dot 0
 seta crosshair_dot_alpha 1
 seta crosshair_dot_size 0.600000
-seta crosshair_dot_color "1 0 0" 
+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
@@ -37,13 +37,9 @@ seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed"
 seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed"
 
 // change color based on special case
-seta crosshair_color_by_health 0 "if enabled, crosshair color will depend on current health"
-seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color"
-
-// change color randomly on a timer
-seta crosshair_rainbow 0
-seta crosshair_rainbow_delay 0.1
-seta crosshair_rainbow_brightness 2 "color brightness of the random crosshair colors"
+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 20 "color brightness of the random crosshair colors"
 
 
 // ===============================