From: mattn Date: Wed, 25 Jun 2008 22:05:08 +0000 (+0000) Subject: * changed eol-style to native X-Git-Tag: xonotic-v0.7.0~16^2~12^2~112^2~2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=07dde321ba69da235d13ebea3264e4c6486fa5ef * changed eol-style to native git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@257 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- diff --git a/CHANGES-MACOS b/CHANGES-MACOS index fbe54618..1792be8b 100644 --- a/CHANGES-MACOS +++ b/CHANGES-MACOS @@ -1,11 +1,11 @@ -Changes file for the MacOS port of GtkRadiant 1.1-TA ----------------------------------------------------- -05/24/2001 -TTimo - Patching the MacOS branch to build on linux -04/15/2001 -Pradeep - Changes so that the whole project compiles under MacOSX/XFree. -03/28/2001 -TTimo - added this file and gave write access to pradeep on the tree (testing write access) +Changes file for the MacOS port of GtkRadiant 1.1-TA +---------------------------------------------------- +05/24/2001 +TTimo + Patching the MacOS branch to build on linux +04/15/2001 +Pradeep + Changes so that the whole project compiles under MacOSX/XFree. +03/28/2001 +TTimo + added this file and gave write access to pradeep on the tree (testing write access) diff --git a/COMPILING b/COMPILING index a53331be..a848ff8f 100644 --- a/COMPILING +++ b/COMPILING @@ -1,7 +1,7 @@ - * understand relative paths in the .game file - * ignore warnings: 4996 4244 4267 - ( some CRT API warning stuff, and size conversion warnings) - * using the same updated Gtk win32 as GtkR 1.5 (may be packaged a bit differently for sanity) - * converted the project files to VC8 - * disabled all the modules that are not necessary for Q3 editing - * default parameters can't be used in function typedefs anymore, removed those and fixed the code accordingly + * understand relative paths in the .game file + * ignore warnings: 4996 4244 4267 + ( some CRT API warning stuff, and size conversion warnings) + * using the same updated Gtk win32 as GtkR 1.5 (may be packaged a bit differently for sanity) + * converted the project files to VC8 + * disabled all the modules that are not necessary for Q3 editing + * default parameters can't be used in function typedefs anymore, removed those and fixed the code accordingly diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3cfab6d2..323dbd0d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,65 +1,65 @@ -GtkRadiant CONTRIBUTORS and CREDITS -last update: 01/15/2001 -======================= - -Loki ----- -Leonardo Zide leo@lokigames.com -Mike Phillips (Loki QA) -Bernd Kreimeier (overall coordination) - -QER.com -------- -TTimo timo@qeradiant.com -^Fishman (Pablo Zurita) fish@gamedesign.net -RR2DO2 rr2do2@q3f.com - -Curry plugin ------------- -Mike "mickey" Jackman -Tim "Maj" Rennie -William "SmallPileOfGibs" Joseph - -PrtView plugin, various bug fixes and q3map guru ------------------------------------------------- -Geoffrey DeWan - -Gensurf plugin --------------- -David Hyde - -PicoModel ---------- -seaw0lf with assist by ydnar - -Q3Map2 ------- -Randy 'ydnar' Reddig - -Updated shader files, textures, entities.def, keyboard shortcut list -overall testing and feedback ----------------------------- -Jean-Francois "Eutectic" Groleau - -Improvements and bug fixing ---------------------------- -Jan Paul "MrElusive" van Waveren -Robert Duffy - -Web ---- -Dave "Bargle" Koenig and Jason "Wolfen" Spencer - -Thanks to John Hutton, AstroCreep and W2k for web help - -FAQ ---- -Equim and Wex - -Misc ----- -Thanks to everyone on the beta mailing list and -irc.telefragged.com #qeradiant for testing and feedback. -Updated icons by AstroCreep! -Bitch-slapping by RaYGunn! -Last minute bugs by SpoG! (SpoG--) +GtkRadiant CONTRIBUTORS and CREDITS +last update: 01/15/2001 +======================= + +Loki +---- +Leonardo Zide leo@lokigames.com +Mike Phillips (Loki QA) +Bernd Kreimeier (overall coordination) + +QER.com +------- +TTimo timo@qeradiant.com +^Fishman (Pablo Zurita) fish@gamedesign.net +RR2DO2 rr2do2@q3f.com + +Curry plugin +------------ +Mike "mickey" Jackman +Tim "Maj" Rennie +William "SmallPileOfGibs" Joseph + +PrtView plugin, various bug fixes and q3map guru +------------------------------------------------ +Geoffrey DeWan + +Gensurf plugin +-------------- +David Hyde + +PicoModel +--------- +seaw0lf with assist by ydnar + +Q3Map2 +------ +Randy 'ydnar' Reddig + +Updated shader files, textures, entities.def, keyboard shortcut list +overall testing and feedback +---------------------------- +Jean-Francois "Eutectic" Groleau + +Improvements and bug fixing +--------------------------- +Jan Paul "MrElusive" van Waveren +Robert Duffy + +Web +--- +Dave "Bargle" Koenig and Jason "Wolfen" Spencer + +Thanks to John Hutton, AstroCreep and W2k for web help + +FAQ +--- +Equim and Wex + +Misc +---- +Thanks to everyone on the beta mailing list and +irc.telefragged.com #qeradiant for testing and feedback. +Updated icons by AstroCreep! +Bitch-slapping by RaYGunn! +Last minute bugs by SpoG! (SpoG--) diff --git a/LICENSE b/LICENSE index e8d70b6f..962a9fb2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,36 +1,36 @@ -LICENSE ( last update: Wed Feb 8 17:16:40 CST 2006 ) ------------------------------------------------------ - -There are 3 license types used throughout GtkRadiant source code. - -BSD - modified Berkeley Software Distribution license -( each BSD licensed source file starts with the appropriate header ) -LGPL - GNU Lesser General Public License v2.1 -( see LGPL at the root of the tree ) -GPL - GNU General Public License -( see GPL at the root of the tree ) - -How do I check which license applies to a given part of the source code? - -Each source file in the tree comes with a license header which explains what -license applies. To sum up shortly: - -GPL: ( except some files contributed by Loki Software under BSD license ) -GtkRadiant Core -GtkRadiant Modules -GtkRadiant Libraries -Quake III Tools -Quake II Tools -Background2D Plugin -HydraToolz Plugin - -BSD: -JPEG Library -MD5 Library -DDS Library -PicoModel Library -PrtView Plugin - -LGPL -BobToolz Plugin -GenSurf Plugin +LICENSE ( last update: Wed Feb 8 17:16:40 CST 2006 ) +----------------------------------------------------- + +There are 3 license types used throughout GtkRadiant source code. + +BSD - modified Berkeley Software Distribution license +( each BSD licensed source file starts with the appropriate header ) +LGPL - GNU Lesser General Public License v2.1 +( see LGPL at the root of the tree ) +GPL - GNU General Public License +( see GPL at the root of the tree ) + +How do I check which license applies to a given part of the source code? + +Each source file in the tree comes with a license header which explains what +license applies. To sum up shortly: + +GPL: ( except some files contributed by Loki Software under BSD license ) +GtkRadiant Core +GtkRadiant Modules +GtkRadiant Libraries +Quake III Tools +Quake II Tools +Background2D Plugin +HydraToolz Plugin + +BSD: +JPEG Library +MD5 Library +DDS Library +PicoModel Library +PrtView Plugin + +LGPL +BobToolz Plugin +GenSurf Plugin diff --git a/README b/README index c0370749..f611ded8 100644 --- a/README +++ b/README @@ -1,49 +1,49 @@ -Terms and Conditions of Use - - -------- - -GTKRadiant contains software developed by Id Software, Loki Software and third -party contributors. - -All portions of GTKRadiant which are licensed by Id Software are subject to the -terms of its LIMITED USE SOFTWARE LICENSE AGREEMENT, a copy of which is included -with GTKRadiant. If you did not receive a LIMITED USE SOFTWARE LICENSE -AGREEMENT, please contact Id Software immediately at info@idsoftware.com. - -All portions of GTKRadiant which have been developed by Loki Software and/or -third party contributors are licensed under the terms set forth below. - -------- - -Copyright (c) 1999-2000, Loki Software, Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -Neither the name of Loki Software nor the names of its contributors may be used -to endorse or promote products derived from this software without specific prior -written permission. No license is hereby granted to any trademarks, tradenames -or logos. - -THIS SOFTWARE IS PROVIDED BY LOKI AND THE CONTRIBUTORS "AS IS." ANY AND ALL -WARRANTUES, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRENGEMENT ARE HEREBY DISCLAIMED. IN NO EVENT SHALL LOKI OR THE -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGE. - -------- +Terms and Conditions of Use + + +------- + +GTKRadiant contains software developed by Id Software, Loki Software and third +party contributors. + +All portions of GTKRadiant which are licensed by Id Software are subject to the +terms of its LIMITED USE SOFTWARE LICENSE AGREEMENT, a copy of which is included +with GTKRadiant. If you did not receive a LIMITED USE SOFTWARE LICENSE +AGREEMENT, please contact Id Software immediately at info@idsoftware.com. + +All portions of GTKRadiant which have been developed by Loki Software and/or +third party contributors are licensed under the terms set forth below. + +------- + +Copyright (c) 1999-2000, Loki Software, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +Neither the name of Loki Software nor the names of its contributors may be used +to endorse or promote products derived from this software without specific prior +written permission. No license is hereby granted to any trademarks, tradenames +or logos. + +THIS SOFTWARE IS PROVIDED BY LOKI AND THE CONTRIBUTORS "AS IS." ANY AND ALL +WARRANTUES, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRENGEMENT ARE HEREBY DISCLAIMED. IN NO EVENT SHALL LOKI OR THE +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. + +-------