merge master and add hittest_blue_teammate

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

diff --git a/crosshairs.cfg b/crosshairs.cfg
index 47631f0fa6cb70b4a664e493ff5dd06bd300bfae..148ee9e0a193a7e48e2184efa12cafe7c021707e 100644 (file)
--- a/crosshairs.cfg
+++ b/crosshairs.cfg
@@ -33,7 +33,8 @@ 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, 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_blur_teammate 0 "blur the crosshair if the shot is obstructed by a teammate"
+seta crosshair_hittest_blur_wall 1 "blur the crosshair if the shot is obstructed by a wall or object"
 seta crosshair_hittest_scale 1.25 "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"