From: Severin Meyer Date: Tue, 3 Feb 2015 16:21:36 +0000 (+0100) Subject: Slightly increase the default scale of the crosshairs X-Git-Tag: xonotic-v0.8.1~126^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa0bc2d260edf7560e4ba5854c02a6a5d2d79dc1;p=xonotic%2Fxonotic-data.pk3dir.git Slightly increase the default scale of the crosshairs --- diff --git a/crosshairs.cfg b/crosshairs.cfg index 4d44688a2..fb341c5b8 100644 --- a/crosshairs.cfg +++ b/crosshairs.cfg @@ -6,13 +6,13 @@ seta crosshair 16 seta crosshair_enabled 1 // main toggle for enabling/disabling crosshair rendering, used mostly just for the menu... 1 = with per-weapon crosshairs, 2 = custom crosshair seta crosshair_color "0.6 0.8 1" -seta crosshair_alpha 0.75 -seta crosshair_size 0.3 +seta crosshair_alpha 0.8 +seta crosshair_size 0.4 // crosshair dot settings seta crosshair_dot 0 seta crosshair_dot_alpha 1 -seta crosshair_dot_size 0.600000 +seta crosshair_dot_size 0.6 seta crosshair_dot_color "1 0 0" seta crosshair_dot_color_custom 1 "use a custom color for the crosshair dot" diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index 7de776dda..8eaff86e3 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '1 0.5 0.5', /* modelname */ "laser", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairlaser 0.4", +/* crosshair */ "gfx/crosshairlaser 0.5", /* wepimg */ "weaponlaser", /* refname */ "blaster", /* wepname */ _("Blaster") diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index ee4878fd4..21a86e7da 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '1 0.5 1', /* modelname */ "crylink", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshaircrylink 0.4", +/* crosshair */ "gfx/crosshaircrylink 0.5", /* wepimg */ "weaponcrylink", /* refname */ "crylink", /* wepname */ _("Crylink") diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index dd167aac2..9e5f98a49 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '1 1 0', /* modelname */ "rl", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairrocketlauncher 0.5875", +/* crosshair */ "gfx/crosshairrocketlauncher 0.7", /* wepimg */ "weaponrocketlauncher", /* refname */ "devastator", /* wepname */ _("Devastator") diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index eadfa0b3b..3f5e75159 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '0 0.5 1', /* modelname */ "electro", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairelectro 0.5", +/* crosshair */ "gfx/crosshairelectro 0.6", /* wepimg */ "weaponelectro", /* refname */ "electro", /* wepname */ _("Electro") diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index ccc87fdc7..f20872f70 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '0.5 1 0', /* modelname */ "campingrifle", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairrifle 0.5", +/* crosshair */ "gfx/crosshairrifle 0.6", /* wepimg */ "weaponrifle", /* refname */ "rifle", /* wepname */ _("Rifle") diff --git a/qcsrc/common/weapons/w_rpc.qc b/qcsrc/common/weapons/w_rpc.qc index b073a3170..387dc32d8 100644 --- a/qcsrc/common/weapons/w_rpc.qc +++ b/qcsrc/common/weapons/w_rpc.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '0.5 0.5 0', /* modelname */ "ok_rl", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairrocketlauncher 0.5875", +/* crosshair */ "gfx/crosshairrocketlauncher 0.7", /* wepimg */ "weaponrpc", /* refname */ "rpc", /* wepname */ _("Rocket Propelled Chainsaw") diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc index 0e78dbae9..14377edb8 100644 --- a/qcsrc/common/weapons/w_vaporizer.qc +++ b/qcsrc/common/weapons/w_vaporizer.qc @@ -9,7 +9,7 @@ REGISTER_WEAPON( /* color */ '0.5 1 1', /* modelname */ "minstanex", /* simplemdl */ "foobar", -/* crosshair */ "gfx/crosshairminstanex 0.4", +/* crosshair */ "gfx/crosshairminstanex 0.6", /* wepimg */ "weaponminstanex", /* refname */ "vaporizer", /* wepname */ _("Vaporizer")