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 00000000..f1f3a5fd Binary files /dev/null and b/packages/crosshairs/lines.png differ diff --git a/packages/crosshairs/oct.png b/packages/crosshairs/oct.png new file mode 100644 index 00000000..42e69c23 Binary files /dev/null and b/packages/crosshairs/oct.png differ diff --git a/packages/crosshairs/oct_dot.png b/packages/crosshairs/oct_dot.png new file mode 100644 index 00000000..e8765105 Binary files /dev/null and b/packages/crosshairs/oct_dot.png differ 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 00000000..83367341 Binary files /dev/null and b/packages/crosshairs/tri.png differ diff --git a/packages/crosshairs/tri_dot.png b/packages/crosshairs/tri_dot.png new file mode 100644 index 00000000..26728754 Binary files /dev/null and b/packages/crosshairs/tri_dot.png differ