From 177d2b51f2ef86b8934c3aab49932b29596a331e Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 23 Oct 2010 19:06:40 +0200 Subject: [PATCH 1/1] less obtrusive ring display --- defaultXonotic.cfg | 2 +- gfx/rifle_ring_1.tga | Bin 3644 -> 0 bytes gfx/rifle_ring_2.tga | Bin 6604 -> 0 bytes gfx/rifle_ring_3.tga | Bin 9564 -> 0 bytes gfx/rifle_ring_4.tga | Bin 12524 -> 0 bytes 5 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 gfx/rifle_ring_1.tga delete mode 100644 gfx/rifle_ring_2.tga delete mode 100644 gfx/rifle_ring_3.tga delete mode 100644 gfx/rifle_ring_4.tga diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index e9cd073be..3ac447e86 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -211,7 +211,7 @@ seta crosshair_fireball_color_green 1.0 "crosshair color green component to disp seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" -seta crosshair_ring_size 3 "bullet counter ring size for Rifle, velocity ring for Nex" +seta crosshair_ring_size 2 "bullet counter ring size for Rifle, velocity ring for Nex" seta crosshair_campingrifle_bulletcounter_alpha 0.15 seta crosshair_nexvelocity_alpha 0.15 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" diff --git a/gfx/rifle_ring_1.tga b/gfx/rifle_ring_1.tga deleted file mode 100644 index 914de35ffa0f709f2f257554ca4187ebb079810c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3644 zcmeH}O-Ni<7>2Ly%s4tBiMpv!aln9!wu9C};>J>fC7Reue?*inB*mY)GBqZcfKl5R zHJa41PEIMMrVAn6Ws!}z6$A-gC{kK$>5nLG1qmeB_c?R#ow+rWZ8sI(xX>b0WC##07V3qoWo2b%etzDJBOJm6y#-g@6U9Nn z3cZGJyrH4Ntgfye6~rcN3k3zM^a@Yr`uqFM!NGyKWi>u|^2A)ed>M_tuQ&DJ{KbN) z0bfT(MqG_sTU(~Ry*=P#P|)}B)TvWuVPU})eE9I8NhA^hAA^FvkIl`^W^HZF6`Y!y zG6e+%2>L!+!9OuI?3((P{&xv;#1ijv`#Gj#juj51Bxo-Bu|r4wTw1|DkoL4zYTw3@ zpvia*oqqB285AZ+XN7@iG@6>2n8=tM-r3nPy}i8%lbS98=R%g?ckP^rkSF8|uL++B z<8^g)W^r-R4H~;MXU+u7zolc&77Kz9M1{D}EL>Abrjp5|+1}nx2QR$4yK4pq2O&ub z0|GV|XNa%_vbbf;2Ql~BnZwtkfTAU4*0>L9AFC>_Hx<)2R zg6FCwj4sgx-#EydL#0rllV$dayUXXm>|N+PJ=dI4vsqH$`CG9kl6FHKIpJ$UfI zR99Djty7~yyYRXYW3D?tu^bn&$*c5yT0lXI&?V4yEhr+j%o?g0pKe=a>{eD*nD2xUWxc{X z!Ye{(T1(nP@8<2$i`iiomOxU7X=zK25X@Ltu!jnE3oASH)|F&#g1ZnD zFafAlddzJDs*_^z0&HD*0nr^l9*h#4bDMQkB$PQ-XA6Pq$l=bEwT7TlTMRe%GDI<5 zPh-+AB|?aMDhH9R|3U)GMZo-q$eol-+e<>TK$p{Tc_}S9$n5McZ0dn2B>yfPlHm0Iv|N``>GmcAsID5ITfe;YAcwU6tU|{Gf+44cfD3Ubf~VVhg?) pA0IJS6e|MkKXUBwg$qCO_t6I**S9o$*zo>)Z?wMKaG^fo`~xJtjvW91 diff --git a/gfx/rifle_ring_2.tga b/gfx/rifle_ring_2.tga deleted file mode 100644 index db0a8088be0106996cf474cd367365ad19c7db09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6604 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 -- 2.39.2