diff --git a/config/menus.cfg b/config/menus.cfg index 14f642e6..08e030d7 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -60,8 +60,8 @@ newmenu about menuitem "AssaultCube v0.94" "" menuitem "" -menuitem " ...help" "showmenu help" -menuitem " ...credits" "showmenu credits" +menuitem " ...Help" "showmenu help" +menuitem " ...Credits" "showmenu credits" menuitem "" menuitem "by 'Rabid Viper Productions'" "showmenu credits" menuitem "http://assault.cubers.net" "echo sorry no built-in web browser yet :)" @@ -85,24 +85,71 @@ menuitem "...for further information/help see the README" "echo 2The readme can newmenu credits -menuitem "Arghvark Project Leader, Code" "" -menuitem "driAn Lead Coder" "" -menuitem "makkE Lead Artist" "" -menuitem " Maps, Models, Skins, Animation" "" -menuitem " Sound, Some Textures, 2D-Art" "" -menuitem "Nieb Models, Hosting" "" -menuitem "Mitaman Maps, Resources" "" -menuitem "Verbal QA, Advisor, Lead Tester" "" -menuitem "Eihrul Coder, Enet Library, Cube2 backporting" "" -menuitem "" -menuitem "Special thanks to:" "" -menuitem "" -menuitem "Aardappel (Engine), Rick (Bots), absinth (AC for Mac)" "" -menuitem "JCDPC (Laptop Mapmodel), dtd (Hosting), Boeck" "" -menuitem "DCP (music), ac_stef (bug fixes), RandumIdiot" "" -menuitem "Ted Southard (DigitalFlux), Noctua Graphics, Arcitool" "" -menuitem "Craig Fortune, 3dcafe, Rohrschach, lemong.fr," "" -menuitem "Mayang.com, Chris Zastrow, imageafter.com (textures)" "" +menuitem "Project Leaders" "" +menuitem "-----------------" "" +menuitem "driAn Lead coder." "" +menuitem "makkE Lead artist, models, skins, animations," "" +menuitem " mapping, 2D-art, textures, sounds." "" +menuitem "" "" +menuitem "Active Developers/Contributors" "" +menuitem "-----------------------------------" "" +menuitem "eihrul Coder, Enet Library, Cube2 backporting." "" +menuitem "RandumIdiot Mapping, documentation, tester, clean-up crew." "" +menuitem "Flowtron Universal team member, additional code, admin." "" +menuitem "" "" +menuitem "Community Mappers" "" +menuitem "-----------------------" "" +menuitem "Shadow Map: ac_elevation." "" +menuitem "Wotwot Map: ac_power, plus textures." "" +menuitem "daMfr0 Map: ac_snow." "" +menuitem "MitaMAN Map: ac_depot, plus textures." "" +menuitem "Nieb Map: ac_desert2, plus mapmodels, 2D-art and hosting." "" +menuitem "" "" +menuitem "Special thanks to..." "" +menuitem "----------------------" "" +menuitem "Aardappel & others The Cube Game/Engine." "" +menuitem "Arghvark Previous project leader, game concept, code." "" +menuitem "Verbal_ Q&A, advisor, lead tester, pro-coffee service." "" +menuitem "Rick Helmus Bot code." "" +menuitem "absinth Packaging AssaultCube for Mac." "" +menuitem "dtd Hosting." "" +menuitem "ac_stef Bug fixes." "" +menuitem "" "" +menuitem " [ Page 2 ]" [ showmenu "Credits (2)" ] + +newmenu "Credits (2)" + +menuitem "Resources (art/models/sounds)" "" +menuitem "----------------------------------" "" +menuitem "JCDPC Laptop mapmodel, textures." "" +menuitem "DCP End-of-match music." "" +menuitem "Toca Mapmodels." "" +menuitem "Topher Some crosshairs." "" +menuitem "leileilol Bullethole image." "" +menuitem "Articool Textures." "" +menuitem "Boeck Textures." "" +menuitem "Craig Fortune Textures." "" +menuitem "Digital Flux Textures." "" +menuitem "mayang.com Textures." "" +menuitem "afflict.net Textures." "" +menuitem "Golgotha team Textures." "" +menuitem "NOCTUA Textures." "" +menuitem "Chris Zastrow Textures." "" +menuitem "Kurt Keslar Dummy texture." "" +menuitem "3D Cafe Textures." "" +menuitem "GRsites Textures." "" +menuitem "Lemog 3D Textures." "" +menuitem "Steini Skyboxes." "" +menuitem "wildweasel Vote sounds." "" +menuitem "Tremulous team Gib sound." "" +menuitem "Lukas Zapletal & Ludek Horacek Music (Ping pong)." "" +menuitem "imageafter.com Textures." "" +menuitem "Rohrschach Textures." "" +menuitem "mayang.com Textures." "" +menuitem "" "" +menuitem "Also thanks to kurtis84, player1, quase, exis, talou and others for testing." "" +menuitem "Thanks to flowtron and exis for organising the 0.93 AssaultCube Release Cup." "" +menuitem "" "" // create additional menus diff --git a/docs/README.xml b/docs/README.xml index f1dc75a1..32420758 100644 --- a/docs/README.xml +++ b/docs/README.xml @@ -1,9 +1,11 @@ - + - README + + README +

About

@@ -15,7 +17,6 @@ gameplay stays fast and arcade. This game is all about team oriented, multi-player fun.

-

The contents of this README:

@@ -101,11 +102,12 @@ Map making tutorial on cubeengine.com -

Help!

-

If you need help when running AC, follow these steps:

+

+ If you need help when running AC, follow these steps: +

  1. @@ -131,7 +133,7 @@

- Instead of posting to the forum, you can also ask the people in our IRC channel, #assaultcube on Quakenet. + Instead of posting to the forum, you can also ask the people in our IRC channel, #assaultcube on Quakenet.

Contribute

@@ -140,7 +142,9 @@
  • Help and discussions on the AssaultCube forum.
    • -
  • Development, testing and gaming on IRC #assaultcube on Quakenet.
    • +
  • + Development, testing and gaming on IRC #assaultcube on Quakenet. +
  • Report bugs on the SourceForge bug tracker.
    • @@ -158,17 +162,20 @@ Adrian “driAn” Henke - Lead coder. + + Lead coder. + Markus “makkE” Bekel - Lead artist, models, skins, animations, mapping, 2d-art, some textures, sounds. + + Lead artist, models, skins, animations, mapping, 2D-art, textures, sounds. + -

    Active Developers/Contributors

    @@ -176,98 +183,338 @@ - + - + - +
    Lee “eihrul” Salzman Coder, Enet Library, Cube2 backporting. + Coder, Enet Library, Cube2 backporting. +
    RandumIdiot Mapping, documentation, tester, clean-up crew, other easy things. + Mapping, documentation, tester, clean-up crew, other easy things. +
    Flowtron Universal team member, additional code, admin. + Universal team member, additional code, admin. +

    Community Mappers

    - + + - - - + + - - + + - - + + - - + + -
    - Shadow + Shadow + + Map: ac_elevation. Map: ac_elevation.
    WotwotMap: ac_power, plus textures. + Wotwot + + Map: ac_power, plus textures. +
    daMfr0Map: ac_snow. + daMfr0 + + Map: ac_snow. +
    MitamanMap: ac_depot, plus textures. + MitaMAN + + Map: ac_depot, plus textures. +
    Shane NiebMap: ac_desert2, plus mapmodels. + Shane Nieb + + Map: ac_desert2, plus mapmodels, 2D-art and hosting. +
    +

    Special thanks to...

    - - + + - - + - + - - + + - - + + - - + + - - - - - - - - - - - - - - + +
    Wouter “Aardappel” van Oortmerssen and othersThe Cube Game/Engine. + Wouter “Aardappel” van Oortmerssen and others + + The Cube Game/Engine. +
    + Andrew “Arghvark” Davis Previous project leader, game concept, code. + Previous project leader, game concept, code. +
    Elliot “Verbal_” Lockwood QA, advisor, lead tester, pro-coffee service. + Q&A, advisor, lead tester, pro-coffee service. +
    Rick HelmusBot code. + Rick Helmus + + Bot code. +
    Julian “absinth” MayerPackaging AssaultCube for Mac + Julian “absinth” Mayer + + Packaging AssaultCube for Mac. +
    Paul “JCDPC” CashLaptop mapmodel. + Zac “dtd” Jarco + + Hosting. +
    Dietmar “DCP” PierSoundtrack.
    Zac “dtd” JarcoHosting.
    ac_stefBug fixes.
    TocaMapmodels + ac_stef + + Bug fixes. +
    +

    Resources (art/models/sounds)

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Paul “JCDPC” Cash + + Laptop mapmodel, textures. +
    + Dietmar “DCP” Pier + + End-of-match music. +
    + Toca + + Mapmodels. +
    + Topher (Death illustrated) + + Some crosshairs. +
    + leileilol of OpenArena + + Bullethole image. +
    + Articool (http://www.articool.de) + + Textures. +
    + Boeck (http://www.boeckmania.de) + + Textures. +
    + Craig Fortune + + Textures. +
    + Digital Flux (http://www.digitalflux.com) + + Textures. +
    + http://www.mayang.com + + Textures. +
    + http://www.afflict.net + + Textures. +
    + Golgotha team + + Textures. +
    + NOCTUA graphics + + Textures. +
    + Chris Zastrow (http://www.newlogicmedia.com) + + Textures. +
    + Kurt Keslar + + Dummy texture. +
    + 3D Cafe (http://www.3dcafe.com) + + Textures. +
    + GRsites + + Textures. +
    + Lemog 3D (http://lemog.club.fr) + + Textures. +
    + Steini + + Skyboxes. +
    + wildweasel + + Vote sounds. +
    + Tremulous team + + Gib sound. +
    + Lukas Zapletal and Ludek Horacek + + Music (Ping pong). +
    + http://www.imageafter.com + + Textures. +
    + Rohrschach + + Textures. +
    + http://www.mayang.com + + Textures. +

    Also thanks to kurtis84, player1, quase, exis, talou and others for testing. diff --git a/docs/getstarted.xml b/docs/getstarted.xml index 38949148..ec516486 100644 --- a/docs/getstarted.xml +++ b/docs/getstarted.xml @@ -15,18 +15,19 @@

    If you've played Cube and your Cube installation runs fine, then - AssaultCube will too.

    + AssaultCube will too. +

    Minimum specs:

    - Keep in mind these are the bare minimums, so you may need a lot of adjustment to get AssaultCube to run. - We reccomend that you run AssaultCube on better hardware than this. + Keep in mind these are the bare minimums, so you may need a lot of adjustment to get AssaultCube to run. + We recommend that you run AssaultCube on better hardware than this.

    Recommended GFX settings for low/medium end machines: @@ -41,32 +42,32 @@ installed.

    - Help for installing AssaultCube on different Operating Systems can be found on the wiki - here. + Help for installing AssaultCube on different Operating Systems can be found on the wiki + here.

    - Setting Resolution + Display settings

    - The default resolution is 1024x768. If you need to change it, modify AssaultCube.bat - accordingly, e.g.: + When you first start AssaultCube, you will be prompted to change some fundamental settings from their + defaults to how you would like them. Some display settings can be changed here.

    - -w800 -h600 + To change more display settings, press ESCAPE and then go: Settings > Video Settings.

    - In linux, simply pass those parameters in the command line or add them to the AssaultCube.sh - shell script. Check the startup section to - see all available command-line options. + If you are having technical problems and need to change settings in a way that doesn't start the game + to do it, you can modify the batch/shell script by adding parameters into it. The different parameters can + be found in command-line options.

    - Running the game + Running AssaultCube

    - Windows: Start the AssaultCube.bat + Windows: Use the shortcut provided. Or execute the AssaultCube.bat file in your AssaultCube folder.

    - Linux: cd to the main AssaultCube directory and execute AssaultCube.sh + Linux: In a console, change your location to the main AssaultCube directory and then execute AssaultCube.sh.

    Basics diff --git a/docs/package_copyrights.txt b/docs/package_copyrights.txt index 9aa21d32..ccf50003 100644 --- a/docs/package_copyrights.txt +++ b/docs/package_copyrights.txt @@ -1,8 +1,10 @@ -This file holds the copyright information for all packages/artwork included in -AssaultCube (UNLESS OTHERWISE NOTED). Please respect the authors reserved rights and permissions. +This file holds the copyright information for all packages/artwork included in AssaultCube (UNLESS OTHERWISE +NOTED) OR it will tell you the place to find the licenses for works within AssaultCube. +Please respect the authors reserved rights and permissions. ---------------MAPS------------------- +------------MAPS---------------------- + ac_complex - Copyright © 2004-2006 by makkE (makk_e@web.de). ac_mines - Copyright © 2004-2006 by makkE (makk_e@web.de). ac_depot - Copyright © 2004-2006 by MitaMAN. @@ -11,31 +13,43 @@ ac_desert2 - By Nieb ac_snow - By daMfr0 ac_power - By wotwot ac_elevation - By A&D_Shadow -ac_toxic - © Copyright 2007-2008 by RandumIdiot (http://www.ri-ac.co.nr) - Detailed copyright info for this map: packages/maps/readme_ac_toxic.txt +ac_toxic - © Copyright 2007-2008 by RandumIdiot (http://www.ri-ac.co.nr). Detailed copyright info for + this map: packages/maps/readme_ac_toxic.txt -The included maps remain intellectual property of their respective creators. -Mapmessages upon load may provide further detail. +The included maps remain intellectual property of their respective creators. Mapmessages upon load may +provide further detail. ---------------MODELS----------------- -Check "/packages/models" and respective subfolders readme files for copyright information. +------------MODELS-------------------- + +Mapmodels: Check "..packages/models/mapmodels/licenses.txt" for copyright information. +Misc models: Check "..packages/models/misc/license.txt" for copyright information. +Pickup models: Check "..packages/models/pickups/license.txt" for copyright information. +Player models: Check "..packages/models/playermodels/readme.txt" for copyright information. +Weapon models: Check "..packages/models/mapmodels/license.txt" for copyright information. ------------------2d------------------ +------------2D------------------------ All files in packages/misc/ - - Copyright © 2005-2006 by makkE + - Copyright © 2005-2006 by makkE. EXCEPT: + - blood.png = Copyright © Shane Nieb -Files in: packages/misc/crosshairs - - Mostly by makkE, some by the Death Illustrated team - (topher), permission to use given by Pushplay (thanks!!) + dFiles in: packages/misc/crosshairs + - Mostly by makkE. + +packages/misc/o.png + o_dot.png + o_x.png + - By: Topher of Death Illustrated team. Permission to use given by Pushplay (Thanks!!) File: packages/misc/bullethole.png - Made by leileilol of OpenArena (licensed under GPL) +File: source/vcpp/buildEnv/header.bmp + - © makkE, all rights reserved + ------------TEXTURES------------------ -_________________________________________________________________________________________ ../packages/textures/arcitool @@ -43,79 +57,75 @@ Copyright by arcitool: http://www.arcitool.de/ German: ------- -WICHTIG: Die angebotenen Dateien und Bilder sind zum kostenlosen download vorgesehen. -Die Dateien erhalten keinen besonderen Schutz, um eine hohe Flexibilität für die -Weiterbearbeitung zu gewährleisten. Die Dateien dürfen beliebig verändert werden. -Mailen Sie uns bitte Änderungsvorschläge, damit wir die Dateien ggf. auf den neuesten -Stand bringen können. +WICHTIG: Die angebotenen Dateien und Bilder sind zum kostenlosen download vorgesehen. Die Dateien erhalten +keinen besonderen Schutz, um eine hohe Flexibilität für die Weiterbearbeitung zu gewährleisten. Die Dateien +dürfen beliebig verändert werden. Mailen Sie uns bitte Änderungsvorschläge, damit wir die Dateien ggf. auf +den neuesten Stand bringen können. -Alle Dateien und Bilder dürfen uneingeschränkt in eigenen Projekten verwendet werden. -Es ist nicht gestattet, die Dateien und Bilder zu veröffentlichen, in andere Sammlungen -einzubauen oder in irgend einer Form zu veräußern. Hierzu bedarf es in jedem Fall der -Erlaubnis von arcitool. +Alle Dateien und Bilder dürfen uneingeschränkt in eigenen Projekten verwendet werden. Es ist nicht gestattet, +die Dateien und Bilder zu veröffentlichen, in andere Sammlungen einzubauen oder in irgend einer Form zu +veräußern. Hierzu bedarf es in jedem Fall der Erlaubnis von arcitool. English: -------- Copyright by arcitool -IMPORTANT: The offered files and images are meant to be freely downloadable. The files -are not protected in any way, to allow high flexibility of usage and reproccession. -Files may be altered in any way. Please mail us suggestions for changes, so we can assure -future quality and replace files eventually. -All files and images may be used without restrictions in your projects.It is prohibited -to offer those files as part of other texture packs or sell or distribute them in any -other way without prior permission from arcitool. -_________________________________________________________________________________________ +IMPORTANT: The offered files and images are meant to be freely downloadable. The files are not protected in +any way, to allow high flexibility of usage and reproccession. Files may be altered in any way. Please mail +us suggestions for changes, so we can assure future quality and replace files eventually. + +All files and images may be used without restrictions in your projects.It is prohibited to offer those files +as part of other texture packs or sell or distribute them in any other way without prior permission from +arcitool. +______________________________________________________________________________________________________________ ../packages/textures/boeck -Royalty Free textures assorted by Boeck, partially reprocessed by makkE to fit the engine -Thanks for the exellent textures/resources !! +Royalty Free textures assorted by Boeck, partially reprocessed by makkE to fit the engine. Thanks for the +excellent textures/resources !! http://www.boeckmania.de -_________________________________________________________________________________________ +______________________________________________________________________________________________________________ ../packages/textures/craig_fortune These great textures were made by Craig Fortune. http://www.garagegames.com/my/home/view.profile.php?qid=27414 -_________________________________________________________________________________________ +______________________________________________________________________________________________________________ ../packages/textures/DigitalFlux These textures are copyright (c) Ted Southard http://www.digitalflux.com -They are free to use for non commercial use. Re-packaging and selling as part of a -texture collection is strictly prohibited. -_________________________________________________________________________________________ +They are free to use for non commercial use. Re-packaging and selling as part of a texture collection is +strictly prohibited. +______________________________________________________________________________________________________________ ../packages/textures/jcdpc (c)Copyright by jcdpc -_________________________________________________________________________________________ +______________________________________________________________________________________________________________ ../packages/textures/makke -Textures here-in are either by makkE, or have been -assembled/reprocessed/tiled/etc from various sources: +Textures here-in are either by makkE, or have been assembled/reprocessed/tiled/etc from various sources: --- http://www.mayang.com/textures --- http://www.afflict.net/option_1/option_1.htm -can i use these textures for free? -you can use any texture for personal or school projects without my permission. -however if you decide to distribute your work i would appreciate credit where credit is due. +Can I use these textures for free? +You can use any texture for personal or school projects without my permission. However if you decide to +distribute your work I would appreciate credit where credit is due. -where can i not use these textures? -any webpage, program, or texture cd that has them available without my permission is -not permitted. you can however use them in a design scheme for your site. +Where can I not use these textures? +Any webpage, program, or texture cd that has them available without my permission is not permitted. You can +however use them in a design scheme for your site. what's with the update delays? -since i'm a full time student and freelance web designer, it's a little hard for me to -find time to get out and take pictures (especially since i live in arizona and it's -500 degrees outside). lately though i've been trying a lot harder to put a lot more -work into the sites content. +Since I'm a full time student and freelance web designer, it's a little hard for me to find time to get out +and take pictures (especially since i live in arizona and it's 500 degrees outside). Lately though I've been +trying a lot harder to put a lot more work into the sites content. --- Golgotha Texture Pack @@ -125,60 +135,106 @@ Free textures from the abandoned "Golgotha" Video game. License Agreement ----------------- -Thanks to the Golgotha creators, these textures are free for use in any project whatsoever, and can -be used in commercial games or anything else unconditionally. -_________________________________________________________________________________________ +Thanks to the Golgotha creators, these textures are free for use in any project whatsoever, and can be used +in commercial games or anything else unconditionally. +______________________________________________________________________________________________________________ ../packages/textures/noctua (C) 2002 by NOCTUA Graphics. All rights reserved. -All textures, materials and 3D objects in the download area can be used without any -restrictions in your own private and commercial projects. -You are not allowed to spread them without giving the creators name, to include them - in texture collections without a written permission and you strictly may not offer - them as textures for sale in any way. -_________________________________________________________________________________________ +All textures, materials and 3D objects in the download area can be used without any restrictions in your own +private and commercial projects. You are not allowed to spread them without giving the creators name, to +include them in texture collections without a written permission and you strictly may not offer them as +textures for sale in any way. +______________________________________________________________________________________________________________ ../packages/textures/zastrow +../packages/textures/sub = Check readme in the folder. Name: sub_crates_v2.zip Author: Chris Zastrow Email: czastrow@newlogicmedia.com URL: http://www.newlogicmedia.com/subverse/ -Greetings from the dark underworld of texture art. Thank you for giving my textures a try. -If you'd like to use these textures commercially, please contact me via email. Please do -not alter these images, or distribute them without this "info.txt" file. Thanks if you -link to my main page, but please don't link to the files directly. Thanks, have fun! ;) -_________________________________________________________________________________________ +Greetings from the dark underworld of texture art. Thank you for giving my textures a try. If you'd like to +use these textures commercially, please contact me via email. Please do not alter these images, or distribute +them without this "info.txt" file. Thanks if you link to my main page, but please don't link to the files +directly. Thanks, have fun! ;) +_____________________________________________________________________________________________________________ ../packages/textures/mitaman Textures from various, approved "free to use for non commercial purpose" resources. Textures here-in remain intellectual property of their respective authors. -Sources include: Subverse, Grsites, Chris Zastrow, lemong.fr, www.3dcafe.com, Rohrschach -_________________________________________________________________________________________ - +Check readme in these folders for information: + +..packages/textures/mitaman/golgotha/readme.txt +..packages/textures/mitaman/Grsites/readme.txt +..packages/textures/mitaman/Zastrow/readme.txt +..packages/textures/mitaman/various/readme.txt +..packages/textures/mitaman/3dcafe/readme.txt +_____________________________________________________________________________________________________________ + +../packages/textures/wotwot/urban + +Textures by wotwot. +_____________________________________________________________________________________________________________ + +../packages/textures/kurt + +Dummy texture. By kurt. ------------SKYBOXES------------------ -Skyboxes (c) 2004 by steini, makkE -(feel free to use the sykboxes in "makke" for whatever you want, read PD) + +(../packages/textures/skymaps) + +Skyboxes (c) 2004 by steini, makkE. +(Feel free to use the sykboxes in "makke" for whatever you want, read PD). ------------SOUNDS-------------------- -Recorded by makkE and/or partially reprocessed from various royalty free/free to modify -samples. (thanks to mitaman for gathering resources) +Recorded by makkE and/or partially reprocessed from various royalty free or free to modify samples (thanks to +MitaMAN for gathering resources). -Note: Shame on me I didn't keep track of my exact sources here. If you recognize any -sound or components of a sound that has copyright issues, please contact me (makkE) -so I can solve it. Thanks. +Note: Shame on me I didn't keep track of my exact sources here. If you recognize any sound or components of a +sound that has copyright issues, please contact me so I can solve it. Thanks, makkE. +_____________________________________________________________________________________________________________ + +..packages/audio/sounds/misc/vote + +Sounds by "wildweasel" + +These works are licensed under a Creative Commons Sampling Plus 1.0 License. +_____________________________________________________________________________________________________________ + +..packages/audio/sounds/player/gib.wav + +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. ------------MUSIC--------------------- -Main Menu Loop: (c) 2005 Dietmar Pier, created for AssaultCube, all rights reserved. - cube.dietmarpier.de + +..packages/audio/songs/ac.ogg + +End-of-match music: © 2005 Dietmar Pier, created for AssaultCube, all rights reserved. + - cube.dietmarpier.de +_____________________________________________________________________________________________________________ + +..packages/audio/songs/pingpong/ + +First run music: These tracks are by Lukas Zapletal & Ludek Horacek (pingpong) +http://tanecni-olomouc.cz/ping-pong/ +------------OTHER LICENSES------------ +AC readme: source/README.txt +CUBE readme: source/README_CUBEENGINE.txt +E-net license: source/enet/license +Cube MasterServer license: source/CubeMS/README.txt +Redistrbutable Windows SDL libraries readme: bin_win32/readme_SDL.txt +Cube Bots readme: docs/cube_bot-readme.txt diff --git a/packages/maps/ac_complex.cgz b/packages/maps/ac_complex.cgz index 0c20c4ce..85800caa 100644 Binary files a/packages/maps/ac_complex.cgz and b/packages/maps/ac_complex.cgz differ diff --git a/packages/misc/crosshairs/readme.txt b/packages/misc/crosshairs/readme.txt index 0b970ed8..8d3f5c2a 100644 --- a/packages/misc/crosshairs/readme.txt +++ b/packages/misc/crosshairs/readme.txt @@ -1,11 +1,12 @@ -crosshairs by makkE +Crosshairs by makkE. -exept +EXCEPT: +------- o.png o_dot.png o_x.png -by topher of Death Illustrated team. +By Topher of Death Illustrated team. diff --git a/packages/models/mapmodels/licenses.txt b/packages/models/mapmodels/licenses.txt index fd236ad0..d7711a50 100644 --- a/packages/models/mapmodels/licenses.txt +++ b/packages/models/mapmodels/licenses.txt @@ -1,10 +1,11 @@ -Actioncube Mapmodels +AssaultCube Mapmodels +__________________________________________________________________________________________________ --------------------------------------------------------------------------------------------------- -These mapmodels have been created for Actioncube. +These mapmodels have been created for AssaultCube. -modelled by Shane Nieb : +Modelled by Shane Nieb : +======================== Chair1 (model+skin) dumpster fence @@ -17,16 +18,11 @@ light01 roadblocks Skinned by makkE unless otherwise noted. - -(!) Laptop model+skin by (c) 2004 by JCDPC, all rights reserved. (!) - -All other objects modelled and skinned by makkE. - ---------------------------------------------------------------------------------------------------- +All other models, unless stated below here, are by makkE. LICENSE -=========== -Files in this folder and subfolders (as stated above): +======= +All files in this folder and their subfolders stated above: by "makkE" Markus Bekel @@ -77,5 +73,21 @@ for the full legal code. visit creativecommons.org for general information and translations of the above documents. ===================================================================================================== - + +__________________________________________________________________________________________________ + +Modelled/Skinned by JCDPC +========================= +Laptop + - © 2004 by JCDPC, all rights reserved. + + +All other objects modelled and skinned by makkE. + +__________________________________________________________________________________________________ + +Modelled/skinned by Toca +======================== +THIS IS THE PLACE FOR TOCA'S MODELS. PUT DETAILS HERE WHEN THEY ARE PUT IN. + diff --git a/source/vcpp/buildEnv/License.txt b/source/vcpp/buildEnv/License.txt index 38638123..bd641593 100644 --- a/source/vcpp/buildEnv/License.txt +++ b/source/vcpp/buildEnv/License.txt @@ -1,11 +1,10 @@ -AssaultCube v0.93 (beta) -LICENSE - -AssaultCube is freeware, you may freely distribute the AssaultCube installer/archive unmodified on any media. You may re-compress using different archival formats (i.e. zip/tgz/rpm/deb/dmg), any changes beyond that require explicit permission. +AssaultCube is FREEWARE, you may freely distribute the AssaultCube installer/archive unmodified on any media. You may re-compress using different archival formats (i.e. zip/tgz/rpm/deb/dmg), any changes beyond that require explicit permission. AssaultCube is distributed WITHOUT WARRANTY, you may use it for any purpose as long as you do not blame us for any damages incurred. -As this game consists of different packages with different licenses, see these files in your AssaultCube installation for additional information: +This game consists of many different packages with different licenses. The ENTIRE AssaultCube package MAY be redistributed as mentioned above. But if you wish to redistribute/use/modify it in a different way you will need to adhere to the licenses for the packages that you are using. + +This is where you can find some of these licenses: * docs/package_copyrights.txt * source/README.txt