Merge branch 'samual/serverlist' into samual/combined_updates

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

diff --git a/crosshairs.cfg b/crosshairs.cfg
index e02e7c2e2ebe50949338d03c0794e6187a174813..365c22af2db9a82f6bde12d6ddaee13ad5817a78 100644 (file)
--- a/crosshairs.cfg
+++ b/crosshairs.cfg
@@ -10,10 +10,10 @@ 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
@@ -32,8 +32,9 @@ seta crosshair_hitindication_speed 5
 
 // hit testing/tracing for special effects for the crosshair
 set g_trueaim_minrange 44 "TrueAim minimum range (TrueAim adjusts shots so they hit the crosshair point even though the gun is not at the screen center)"
-seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate"
+seta crosshair_hittest 1 "do a crosshair hit evaluation, applying effects from the _blur, _scale, and _showipact cvars"
 seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed"
+seta crosshair_hittest_scale 1.25 "enlarge crosshair if aiming at an enemy, shrink crosshair if shot is obstructed or aiming at a teammate"
 seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed"
 
 // change color based on special case