From b2115d6a95ace998238b9a6d7245d33d1a83c7b0 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Thu, 11 Nov 2010 09:25:12 +0000 Subject: [PATCH] Crosshairs update git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5824 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/defaults.cfg | 2 +- config/menus_settings.cfg | 4 +- docs/package_copyrights.txt | 17 +++---- ...ib.ogg license.txt => gib.ogg_license.txt} | 0 packages/crosshairs/license.txt | 42 ++++++++++++++++++ packages/crosshairs/lines.png | Bin 0 -> 359 bytes packages/crosshairs/oct.png | Bin 0 -> 499 bytes packages/crosshairs/oct_dot.png | Bin 0 -> 511 bytes packages/crosshairs/readme.txt | 12 ----- packages/crosshairs/tri.png | Bin 0 -> 425 bytes packages/crosshairs/tri_dot.png | Bin 0 -> 431 bytes 11 files changed, 50 insertions(+), 27 deletions(-) rename packages/audio/player/{gib.ogg license.txt => gib.ogg_license.txt} (100%) create mode 100644 packages/crosshairs/license.txt create mode 100644 packages/crosshairs/lines.png create mode 100644 packages/crosshairs/oct.png create mode 100644 packages/crosshairs/oct_dot.png delete mode 100644 packages/crosshairs/readme.txt create mode 100644 packages/crosshairs/tri.png create mode 100644 packages/crosshairs/tri_dot.png diff --git a/config/defaults.cfg b/config/defaults.cfg index 014afe4b..655b3e8d 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -2,7 +2,7 @@ // Do not modify anything below, instead change settings in game, or add to autoexec.cfg name "unarmed" // Change your name! -loadcrosshair default.png // Choose another crosshair, see packages/misc/crosshairs/ +loadcrosshair default.png // Choose another crosshair, see ./packages/crosshairs/ loadcrosshair teammate.png teammate // Teammate crosshair. loadcrosshair red_dot.png scope // Scope crosshair. skin 0 // Change your look. diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 9faa1694..5e0304db 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -282,10 +282,10 @@ menuitem "Change crosshair... " "showmenu Crosshairs" menuitem "Change scope crosshair... " "showmenu [Scope crosshairs]" newmenu "Crosshairs" -menudirlist "packages/misc/crosshairs" "png" "loadcrosshair (concatword $arg1 .png)" 1 +menudirlist "packages/crosshairs" "png" "loadcrosshair (concatword $arg1 .png)" 1 newmenu "Scope crosshairs" -menudirlist "packages/misc/crosshairs" "png" "loadcrosshair (concatword $arg1 .png) scope" 1 +menudirlist "packages/crosshairs" "png" "loadcrosshair (concatword $arg1 .png) scope" 1 newmenu "Reset Binds" menuinit [ alias resetbindsyes 0 ] // Ensures this menu works correctly. diff --git a/docs/package_copyrights.txt b/docs/package_copyrights.txt index 4398b22e..eb50fbb7 100644 --- a/docs/package_copyrights.txt +++ b/docs/package_copyrights.txt @@ -29,13 +29,8 @@ EXCEPT: - blood.png = Copyright © Shane Nieb - scope.png = By Attila "Antiklimax" Feher, 2008. -Files in: packages/misc/crosshairs - - Mostly by makkE. - -packages/misc/crosshairs/o.png - o_dot.png - o_x.png - - By: Topher of Death Illustrated team. Permission to use given by Pushplay (Thanks!!) +packages/misc/crosshairs/* + Please read the "license.txt" file inside this folder. File: packages/misc/bullethole.png - Made by leileilol of OpenArena (licensed under GPL) @@ -212,14 +207,12 @@ sound that has copyright issues, please contact me so I can solve it. Thanks, ma _____________________________________________________________________________________________________________ -..packages/audio/sounds/player/gib.wav +..packages/audio/player/gib.ogg + Please read "gib.ogg_license.txt" for more information. -This sound is from the game tremoulous, licensed under the CREATIVE COMMONS ATTRIBUTION-SHAREALIKE 2.5 -LICENSE. Please read http://creativecommons.org/licenses/by-sa/2.5/ to learn more about this license. The -full license text is contained in the file named CC. ____________________________________________________________________________________________________________ -..packages/audio/sounds/weapon/ric*.wav +..packages/audio/weapon/ric*.wav These sounds are from OpenArena and are licensed under the terms of the GNU General Public License (GPL) http://www.gnu.org/licenses/gpl-2.0.txt diff --git a/packages/audio/player/gib.ogg license.txt b/packages/audio/player/gib.ogg_license.txt similarity index 100% rename from packages/audio/player/gib.ogg license.txt rename to packages/audio/player/gib.ogg_license.txt diff --git a/packages/crosshairs/license.txt b/packages/crosshairs/license.txt new file mode 100644 index 00000000..374742a3 --- /dev/null +++ b/packages/crosshairs/license.txt @@ -0,0 +1,42 @@ +Crosshairs by Markus "makkE" Bekel: +=================================== +cube.png dot_wide.png star.png +default.png teammate.png wide.png +dot.png red_dot.png x-dot.png + + +Crosshairs by Topher (Death Illustrated): + (http://webpages.charter.net/crossen2798/di/) +===================================================== +lines.png oct_dot.png oct.png tri_dot.png +tri.png o.png o_dot.png o_x.png + + +All of these crosshairs are licensed under "Attribution-ShareAlike 2.0 Generic" Creative Commons. + http://creativecommons.org/licenses/by-sa/2.0/ + +This means you are free: + * to Share — to copy, distribute and transmit the work + * to Remix — to adapt the work + +Under the following conditions: + * Attribution — You must attribute the work in the manner specified + by the author or licensor (but not in any way that suggests that + they endorse you or your use of the work). + * Share Alike — If you alter, transform, or build upon this work, + you may distribute the resulting work only under the same or + similar license to this one. + +With the understanding that: + * Waiver — Any of the above conditions can be waived if you get + permission from the copyright holder. + * Public Domain — Where the work or any of its elements is in the public + domain under applicable law, that status is in no way affected by the license. + * Other Rights — In no way are any of the following rights affected by the license: + o Your fair dealing or fair use rights, or other applicable + copyright exceptions and limitations; + o The author's moral rights; + o Rights other persons may have either in the work itself or in how the work + is used, such as publicity or privacy rights. + * Notice — For any reuse or distribution, you must make clear to others the license terms of this work. + diff --git a/packages/crosshairs/lines.png b/packages/crosshairs/lines.png new file mode 100644 index 0000000000000000000000000000000000000000..f1f3a5fde0eb3a2af590caea2974794576d5b1b7 GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WSkfJR9T^yIGCN)KUkH*+_6YK2 zV5m}MU}$J&VECfKz|eA@fgv}Zf#F3K1A|RB1A}z<%D0VTK((JdT^vIy<|HL7Fl69R zn5EpnkaR@<@BjbxhujPv8M7!fWb`pGbv)yMGFCh|EGm4Y#m<4@q6{O8fZdTJM_hIq zH83n{W7{Le$i&gr;ragmL)g{qk&>3+ZhxZI3gSjGKE4w-0zGI432^~Gv_a8WMFi0@^dR=`M6U` zp<#okcZ4uEe zG`M*UfwXuf8FT^7c>x(jn|l`^2;$=8APqSMf-MoQl9SQL_lO~UTF0Z=*0WfrbAHeJ zc0BKUSmuRBqtSdm9}EUeold9IdcD40ueCG((QVuQrPJ+p+iW)de*Y=zr#d8x;%c>$ zBx%3j`@T;Oh3EP4cs!j>IgVQ{mr)ee#18K9ctl*t0C~`)izPu2-0yeGvTBy(QybA6 zENo4$U(T}ZWHQ0e*sk4f*Mgo4o8h`{?jZ=mV-&ljD9Yt>A-@ciDqg?C;eed7q1kK} z$8jh0k_Y~h%%fX+$pdGQ!NWAo4(Wx5=Xrp0_<{{+cF-vlhGBk4xo){teGR?_UxSYt zpiXBGlnWG%);-{rP)AYe0B7FmVg!1DeYaDR=?~!ZR@Ypl*88N@HB^1;Ew{RcbgI_d z&V!a-co>F(sgxcCJxLNx)2ei~x@I^Ws;Y|X=J|Yf90zwoflVuqn7K??h>uH)& pWsN|#+bz&Ew`+utBp&CsqCcE@nwgJbC;$Ke002ovPDHLkV1i72000SaNLh0L01EH`01EH{Laa2H0004=NklG~P&-<>_=PNm7F*-}jfxWf+Fkp8x3E?e@v0`~ALJtva2~OH`}e)bICoT~`$4 za5$V!C-PL9&E{Y*P*qhF#o26jy**LuCKKu?9m*zfnLN3Yk*TCqyw@%VDNkT(OP^6hs#9uZU0G?`3p zw_7drf(JfH;!!WX;DIyPz{9rf8tJ)*<2Znec)KoNq++ipq0buRBHeL002ovPDHLkV1j7+ B@6-SQ literal 0 HcmV?d00001 diff --git a/packages/crosshairs/readme.txt b/packages/crosshairs/readme.txt deleted file mode 100644 index 8d3f5c2a..00000000 --- a/packages/crosshairs/readme.txt +++ /dev/null @@ -1,12 +0,0 @@ -Crosshairs by makkE. - - -EXCEPT: -------- -o.png -o_dot.png -o_x.png - -By Topher of Death Illustrated team. - - diff --git a/packages/crosshairs/tri.png b/packages/crosshairs/tri.png new file mode 100644 index 0000000000000000000000000000000000000000..833673413b55c16cc21e24eabcfae791b2a4ab5f GIT binary patch literal 425 zcmV;a0apHrP)C=B4+Jw|0|OI}D^`$Y*41I=g5%hVWTv~iYUuKI z`{3V0I6U=zpN+04it8e&)FOVLGVjY`*$G-0zb(!zV@$WS%zUS41<%= zb={4Myr}CMYmlZXj|oLl-tugd$8oeQi+Mm8hMRoTG|4+zmaD45@Uko=NjfJIMe+4e z)3mPZ)^&~J`1l!Y+rB@54+i;B6oDNxFzL7g!Xcm1#5?&Ib5_S};#xkB30nEgCTQgo zCa_dkt;>2{*ZaPwmA?T|Kp?Qu2*-IP))AS4nx<(~Riz!Uw;`4Y=Sd|3g;>!@Vd6wk>frP18Kjj^nVifAGK$5IjCj T+!b*O00000NkvXXu0mjfCu6uu literal 0 HcmV?d00001 diff --git a/packages/crosshairs/tri_dot.png b/packages/crosshairs/tri_dot.png new file mode 100644 index 0000000000000000000000000000000000000000..26728754cb659ab917a993d617e32aaa6b6d53ea GIT binary patch literal 431 zcmV;g0Z{&lP)<+3Nq%sJoBa6WIh zPyPE6PEUQ`XM-z>;<^dw->mhj?A$?~=WGswAo!)H{ktUy0zb%eeeGY%vJAsu7zQVz z>$)4%@uIG4tU;QlJSG%Hd5g0#kK<@r7BfK@hMRoTG>><(ELT+p^0F)?Ng@M@qWF5K zX$=8qeEtl!ZQmb-k5k+&P48HvC;~b-z;xaL;gC--K_J-WgNEe&(geGFN)uf2 znN85jKbXK$VYM#%bzSfKo>u-=hyntEjYc@gomfX?3Tm3BQB{?eU>`#)5l%uU0)<%7 zNMV_z*TFcJUfoVj{d1f Z{QyGrN;USzkZJ$`002ovPDHLkV1j0_ydMAn literal 0 HcmV?d00001