Merge branch 'master' into for-0.51.0

fix #1057

COPYING.txt

@@ -3,34 +3,20 @@ Unvanquished is licensed in two broadly separate sections: the code and the
 media.
 
 The code is licensed under the GNU GENERAL PUBLIC LICENSE. This license is
-contained in full in the file named GPL. Please be aware of the exceptions to
-this license as listed below.
+contained in full in the file named GPL.txt. Please be aware of the exceptions
+to this license as listed below.
 
 The media is 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. Please be aware of the exceptions to this license as listed below.
+more about this license.
 
 ---------------------------------------------------- Code License Exceptions ---
 The following files contain sections of code that are not licensed under the
 GPL, but are nevertheless GPL compatible. The license text for these licenses
 is contained within the files as listed.
 
     src/cgame/cg_api.cpp                                         BSD license
-
---------------------------------------------------- Media License Exceptions ---
-All shaderlab (http://www.shaderlab.com/) textures (by Randy 'ydnar' Reddig)
-are subject to the following license:
-  Usage and redistribution policy: Textures may be freely downloaded, modified,
-  and used in free maps, mods or total conversions provided this copyright
-  notice is left intact and a link to Shaderlab is provided in the credits or
-  read-me file. Other non-commercial applications are considered on a
-  case-by-case basis via e-mail. All other usage requires written permission.
-  Bulk redistribution or archival of the textures in any medium, digital or
-  otherwise (except mapping packages for mods) is prohibited.
-
---------------------------------------------------------------------------------
-
+    src/sgame/sg_api.cpp                                         BSD license
 
 ------------------------------------------------------ ET-XreaL Code License ---
 The ET-XreaL code is licensed under the GNU GENERAL PUBLIC LICENSE. This
@@ -46,9 +32,3 @@ these additional terms immediately following the terms and conditions of the
 GNU GPL which accompanied the Wolf ET Source Code. If not, please request a
 copy in writing from id Software at id Software LLC, c/o ZeniMax Media Inc.,
 Suite 120, Rockville, Maryland 20850 USA.
-
-EXCLUDED CODE: The code described below and contained in the Wolfenstein:
-Enemy Territory GPL Source Code release is not part of the Program covered
-by the GPL and is expressly excluded from its terms. You are solely
-responsible for obtaining from the copyright holder a license for such code
-and complying with the applicable license terms.

src/cgame/Filter.h

@@ -1,9 +1,10 @@
 /*
 ===========================================================================
 
-Copyright 2015 Unvanquished Developers
+Unvanquished GPL Source Code
+Copyright (C) 2015 Unvanquished Developers
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
 Unvanquished is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

src/cgame/cg_animation.cpp

@@ -1,23 +1,26 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
 

src/cgame/cg_animdelta.cpp

@@ -1,23 +1,26 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
 

src/cgame/cg_animdelta.h

@@ -1,27 +1,32 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
+
 #ifndef CG_ANIMDELTA_H
 #define CG_ANIMDELTA_H
+
 #include <vector>
 #include <unordered_map>
 

src/cgame/cg_animmapobj.cpp

@@ -1,23 +1,26 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
 

src/cgame/cg_api.cpp

@@ -1,17 +1,20 @@
 /*
 ===========================================================================
-Daemon BSD Source Code
-Copyright (c) 2013-2016, Daemon Developers
+
+Unvanquished BSD Source Code
+Copyright (c) 2013-2016, Unvanquished Developers
 All rights reserved.
 
+This file is part of the Unvanquished BSD Source Code (Unvanquished Source Code).
+
 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 the Daemon developers nor the
+    * Neither the name of the Unvanquished developers nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
@@ -25,6 +28,7 @@ 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.
+
 ===========================================================================
 */
 

src/cgame/cg_attachment.cpp

@@ -1,22 +1,25 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
 

src/cgame/cg_beacon.cpp

@@ -1,22 +1,23 @@
 /*
 ===========================================================================
 
-Copyright 2014 Unvanquished Developers
+Unvanquished GPL Source Code
+Copyright (C) 2014 Unvanquished Developers
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software: you can redistribute it and/or modify
+Unvanquished is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-Daemon is distributed in the hope that it will be useful,
+Unvanquished is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon.  If not, see <http://www.gnu.org/licenses/>.
+along with Unvanquished.  If not, see <http://www.gnu.org/licenses/>.
 
 ===========================================================================
 */

src/cgame/cg_buildable.cpp

@@ -1,23 +1,26 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
 
@@ -766,7 +769,7 @@ bool CG_GetBuildableRangeMarkerProperties( buildable_t bType, rangeMarker_t *rmT
 			break;
 
 		case BA_A_SPIKER:
-			*range = SPIKER_SPIKE_RANGE;
+			*range = SPIKER_SENSE_RANGE;
 			shc = SHC_PINK;
 			break;
 

src/cgame/cg_consolecmds.cpp

@@ -1,23 +1,26 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */
 

src/cgame/cg_draw.cpp

@@ -1,23 +1,26 @@
 /*
 ===========================================================================
+
+Unvanquished GPL Source Code
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2009 Darklegion Development
 
-This file is part of Daemon.
+This file is part of the Unvanquished GPL Source Code (Unvanquished Source Code).
 
-Daemon is free software; you can redistribute it
+Unvanquished is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Daemon is distributed in the hope that it will be
+Unvanquished is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Daemon; if not, write to the Free Software
+along with Unvanquished; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ===========================================================================
 */