From: FruitieX Date: Mon, 29 Nov 2010 18:51:29 +0000 (+0200) Subject: make an awesome crosshair default ;) X-Git-Tag: xonotic-v0.1.0preview~94^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d99343b2d384d684b0085cc6d078e27c701cc5b6;p=xonotic%2Fxonotic-data.pk3dir.git make an awesome crosshair default ;) --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index ee2219bbc..bf1d943da 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -89,14 +89,14 @@ _cl_color 102 _cl_name Player _cl_playermodel models/player/umbra.iqm _cl_playerskin 0 -seta crosshair 3 +seta crosshair 16 seta crosshair_color "0.6 0.8 1" -seta crosshair_alpha 1 -seta crosshair_size 0.35 +seta crosshair_alpha 0.3 +seta crosshair_size 0.5 seta crosshair_dot 1 seta crosshair_dot_alpha 1 -seta crosshair_dot_size 1 -seta crosshair_dot_color 0 "when != 0, use custom color for the crosshair dot" +seta crosshair_dot_size 0.6 +seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair dot" seta crosshair_pickup 0.25 seta crosshair_pickup_speed 4 seta crosshair_per_weapon 0 "when 1, each gun will display a different crosshair" diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index a3fa9c216..714b5d333 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -1006,7 +1006,7 @@ void CSQC_UpdateView(float w, float h) wcross_color_old = wcross_color; if(cvar_string("crosshair_dot_color") != "0") wcross_color = stov(cvar_string("crosshair_dot_color")); - CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha")); + CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", f * cvar("crosshair_dot_alpha")); wcross_color = wcross_color_old; }