Merge branch 'master' of https://github.com/pioneerspacesim/pioneer.git…

… into cash_view
Luomu · Sep 23, 2012 · c45cdc0 · c45cdc0
2 parents db123d9 + 70946eb
commit c45cdc0
Show file tree

Hide file tree

Showing 627 changed files with 2,608 additions and 234 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1,88 +1,108 @@
-The Pioneer team, past and present, as at 14 September 2012 (alpha 26):
-
-  Aaron Lewis
-  Aaron Senese
-  Ae
-  Alessandro Giachi
-  Andrew Copland
-  Asier Basagoiti
-  Benamucki
-  Benjamin Hodgetts
-  Blaga Cosmin
-  Brian Ronald
-  C de Craen
-  Chris Dennett
-  Craig Thomson
-  Dan Bennett
-  Darren Salt
-  Enric Morales
-  Fran Morton
-  Gareth Allnutt
-  Gernot
-  John Bartholomew
-  John Jordan
-  Kimmo Kotajärvi
-  Konrad Mruk
-  Krzysztof Niedźwiecki
-  Lee Reilly
-  Lars Westerhoff
-  Leonardo Manna
-  Marcel Tulloh
-  Marcus de Roos
-  Michele Botticelli
-  Nic
-  Paul Mahol
-  Paul Roberts
-  Peter Kurucz
-  Phil Howlett
-  Piotr Gredka
-  Robert Norris
-  Sean Bailey
-  Simon Chopin
-  Steve Tyler
-  Sukender (Benoit Neil)
-  Taiki Kim
-  Thierry Dupré
-  Tim Jones
-  Tom Morton
-  Ulf Pettersson
-  Uncle Bob
-  Vincent Teerling
-
-Thanks also to the ever-enthusiastic inhabitants of the SpaceSimCentral
-forums. You drive us crazy, but we still love you :)
+Authors
+=======
 
+As of 14 September 2012 (alpha 26), the Pioneer Developers are:
+
+* Aaron Lewis
+* Aaron Senese
+* Ae
+* Alessandro Giachi
+* Andrew Copland
+* Asier Basagoiti
+* Benamucki
+* Benjamin Hodgetts
+* Blaga Cosmin
+* Brian Ronald
+* C de Craen
+* Chris Dennett
+* Craig Thomson
+* Dan Bennett
+* Darren Salt
+* Enric Morales
+* Fran Morton
+* Gareth Allnutt
+* Gernot
+* John Bartholomew
+* John Jordan
+* Kimmo Kotajärvi
+* Konrad Mruk
+* Krzysztof Niedźwiecki
+* Lee Reilly
+* Lars Westerhoff
+* Leonardo Manna
+* Marcel Tulloh
+* Marcus de Roos
+* Michele Botticelli
+* Nic
+* Paul Mahol
+* Paul Roberts
+* Peter Kurucz
+* Phil Howlett
+* Piotr Gredka
+* Robert Norris
+* Sean Bailey
+* Simon Chopin
+* Steve Tyler
+* Sukender (Benoit Neil)
+* Taiki Kim
+* Thierry Dupré
+* Tim Jones
+* Tom Morton
+* Ulf Pettersson
+* Uncle Bob
+* Vincent Teerling
+
+Licensing
+=========
+
+Copyright © 2008-2012 Pioneer Developers
+
+Pioneer's core code and extension modules are licensed under the terms of the
+GNU General Public License version 3. See licenses/GPL-3.txt for details.
+
+Pioneer's art, music and other assets (including Lua model scripts) are
+licensed under the terms of the Creative Commons Attribution-ShareAlike 3.0
+Unported License. See licenses/CC-BY-SA-3.0.txt for details.
 
 Pioneer includes the following third-party software:
 
   Lua 5.2.1 by R. Ierusalimschy, L. H. de Figueiredo & W. Celes,
   Copyright (C) 1994-2012 Lua.org, PUC-Rio
-  Licensed under the MIT licence (see lua.COPYING.txt)
+  Licensed under the MIT licence (see contrib/lua/lua.h)
 
-  miniz by Rich Geldreich
+  miniz by Rich Geldreich, April 2012
   Public domain (see contrib/miniz/miniz.h)
 
+  lookup3.c, by Bob Jenkins, May 2006,
+  Public domain (see contrib/jenkins/lookup3.c)
+
+  vcacheopt.h
+  Copyright (C) 2009, Michael Georgoulpoulos
+  Licensed under the MIT licence (see contrib/vcacheopt/vcacheopt.h)
+
   Cousine font
   Copyright (C) 2010 Google, Inc
-  Licensed under the SIL Open Font Licence v1.1 (see fonts.COPYING.txt)
+  Licensed under the SIL Open Font Licence v1.1 (see licenses/SIL-1.1.txt)
 
   Titillium Text font
   Copyright (C) 2007-2009 Academia di Belle Arte di Urbino - Campivisivi
-  Licensed under the SIL Open Font Licence v1.1 (see fonts.COPYING.txt)
+  Licensed under the SIL Open Font Licence v1.1 (see licenses/SIL-1.1.txt)
 
   Inconsolata font
   Copyright (C) 2006, Raph Levien
-  Licensed under the SIL Open Font Licence v1.1 (see fonts.COPYING.txt)
+  Licensed under the SIL Open Font Licence v1.1 (see licenses/SIL-1.1.txt)
 
-  lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+Acknowledgements
+================
 
-  vcacheopt.h
-  Copyright (C) 2009, Michael Georgoulpoulos
-  Licensed under the MIT licence (see the license block in the file)
+The Pioneer Developers would like to acknowledge the following fine products
+and services, without which Pioneer would not be possible:
 
-Pioneer also makes use of these fine projects. Thanks a lot!
+  SDL           http://www.libsdl.org/
+  FreeType      http://freetype.org/
+  Ogg Vorbis    http://vorbis.com/
+  libsigc++     http://libsigc.sourceforge.net/
+  MXE           http://mxe.cc/
 
-  SDL
-  FreeType
-  Ogg Vorbis
-  MinGW
+  GitHub        https://github.com/
+  SourceForge   https://sourceforge.net/
diff --git a/Changelog.txt b/Changelog.txt
@@ -2,13 +2,18 @@ Alpha 27
 
    * New features
      * The settings screen is now acessible from the main menu (#1187, #1512)
+     * There's now an option to enable texture compression (#1522)
+     * New mission type, Scout (get paid to scan particular planets) (#1348, #779)
 
    * Minor changes and tweaks
      * Smooth zoom animation in World, System, Sector and Galactic views (#1170)
      * Earth start location has returned to Los Angeles (in daytime now) (#1506)
 
    * Fixes
      * Avoid icons in some ternary systems overlapping each other (#1510, #1511) 
+     * Fix overlapping text for long system descriptions (#1494, #1498)
+     * Fix crash in SystemInfoView from leaking widget references (#1526,  #1493)
+     * Clamp some newer terrain heights to non-negative values (#1534, #1530)
 
    * Script changes
      * EventQueue, which was deprecated in alpha 26, has been removed (#1485)
@@ -19,6 +24,9 @@ Alpha 27
      * Terrain generation thread now sleeps until being signalled (#1169)
      * New C++ wrappers for Lua table manipulation and value persistence (#1438)
      * Terrain patches are now rendered more efficiently (#1507)
+     * Many minor cleanups identified by valgrind (#1524)
+     * Copyright and license is now made explicit at the top of all code files (#1515)
+     * Max terrain height for heightmapped planets is computed more accurately (#1504)
 
 Alpha 26
 

diff --git a/Makefile.am b/Makefile.am
@@ -16,11 +16,13 @@ enums:
 EXTRA_DIST = \
 	AUTHORS.txt \
 	COMPILING.OSX.txt \
-	COPYING.txt \
 	Changelog.txt \
 	Modelviewer.txt \
 	Quickstart.txt \
 	README.txt \
+	licenses/CC-BY-SA-3.0.txt \
+	licenses/GPL-3.txt \
+	licenses/SIL-1.1.txt \
 	bootstrap \
 	generic-exec \
 	Makefile.common \

diff --git a/configure.ac b/configure.ac
@@ -1,3 +1,6 @@
+dnl Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+dnl Licensed under the terms of the GPL v3. See COPYING.txt for details
+
 dnl Process this file with autoconf to create configure.
 
 dnl ###########################################################################

diff --git a/data/lang/English.txt b/data/lang/English.txt
@@ -220,10 +220,12 @@ WINDOW_OR_FULLSCREEN
     Windowed or fullscreen (restart to apply)
 FULL_SCREEN
     Full screen
+COMPRESS_TEXTURES
+	Compress Textures
 OTHER_GRAPHICS_SETTINGS
-    Other graphics settings
+    Other graphics settings (restart to apply)
 USE_SHADERS
-    Use shaders (restart to apply)
+    Use shaders
 SOUND_SETTINGS
     Sound settings
 VOL_MASTER

diff --git a/data/lang/Polski.txt b/data/lang/Polski.txt
@@ -214,6 +214,8 @@ LOAD_A_GAME
     [L] Wczytaj grę
 EXIT_THIS_GAME
     Wyjdź z gry
+RETURN_TO_MENU
+    Powrót do menu
 WINDOW_OR_FULLSCREEN
     Okno lub pełny ekran (wymagany restart)
 FULL_SCREEN
@@ -620,6 +622,8 @@ MM_START_NEW_GAME_DEBUG
     Nowa gra: rozpocznij z debug point
 MM_LOAD_SAVED_GAME
     Wczytaj grę
+MM_SETTINGS
+    Opcje
 MM_QUIT
     Wyjdź
 SCREENSHOT_FILENAME_TEMPLATE

diff --git a/data/lang/Spanish.txt b/data/lang/Spanish.txt
@@ -214,6 +214,8 @@ LOAD_A_GAME
     [L] Cargar un Juego
 EXIT_THIS_GAME
     Abandonar el Juego
+RETURN_TO_MENU
+    Volver a menu
 WINDOW_OR_FULLSCREEN
     Ventana o Pantalla completa (Reiniciar para aplicar)
 FULL_SCREEN
@@ -620,6 +622,8 @@ MM_START_NEW_GAME_DEBUG
     Comenzar Juego Nuevo en punto de depuración
 MM_LOAD_SAVED_GAME
     Cargar un juego
+MM_SETTINGS
+    Ajustes
 MM_QUIT
     Salir
 SCREENSHOT_FILENAME_TEMPLATE
@@ -1200,3 +1204,27 @@ X_PASSENGER_CABINS
     %quantity cabinas de pasajeros ocupadas
 CABINS
     Cabinas
+MONTH_JAN
+    Ene
+MONTH_FEB
+    Feb
+MONTH_MAR
+    Mar
+MONTH_APR
+    Abr
+MONTH_MAY
+    May
+MONTH_JUN
+    Jun
+MONTH_JUL
+    Jul
+MONTH_AUG
+    Ago
+MONTH_SEP
+    Sep
+MONTH_OCT
+    Oct
+MONTH_NOV
+    Nov
+MONTH_DEC
+    Dic
diff --git a/data/libs/00-Event.lua b/data/libs/00-Event.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
 --
 -- Interface: Event
 --

diff --git a/data/libs/Characters.lua b/data/libs/Characters.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
 --
 -- Class: Character
 --

diff --git a/data/libs/FlightLog.lua b/data/libs/FlightLog.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
 --
 -- Class: FlightLog
 --

diff --git a/data/libs/NameGen.lua b/data/libs/NameGen.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
 --
 -- Interface: NameGen
 --

diff --git a/data/libs/StringInterp.lua b/data/libs/StringInterp.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
 -- a nice string interpolator
 string.interp = function (s, t)
 	return (s:gsub('(%b{})', function(w) return t[w:sub(2,-2)] or w end))

diff --git a/data/libs/Translate.lua b/data/libs/Translate.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
 --
 -- Class: Translate
 --

diff --git a/data/models/adverts.lua b/data/models/adverts.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 define_model('diet_steakette', {
 	info = {
 		bounding_radius = 1.0,

diff --git a/data/models/buildings/city/building1/building1.lua b/data/models/buildings/city/building1/building1.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 --[[
 define_model('building1', {
 	info = {

diff --git a/data/models/buildings/city/building2/building2.lua b/data/models/buildings/city/building2/building2.lua
@@ -1,3 +1,6 @@
+-- Copyright ÂŠ 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 --[[
 define_model('octaeder1', {
 	info = {

diff --git a/data/models/buildings/city/church/church.lua b/data/models/buildings/city/church/church.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 --[[
 define_model('church', {
 	info = {

diff --git a/data/models/buildings/city/factory1/factory1.lua b/data/models/buildings/city/factory1/factory1.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 --[[
 --updated 05/08/2010
 define_model('rotor', {

diff --git a/data/models/buildings/city3k/_church3k/church_new_0.lua b/data/models/buildings/city3k/_church3k/church_new_0.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 --[[
 define_model('church_new_clockhd', {
     info = {

diff --git a/data/models/buildings/city3k/_submodels.lua b/data/models/buildings/city3k/_submodels.lua
@@ -1,3 +1,6 @@
+-- Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+-- Licensed under the terms of CC-BY-SA 3.0. See licenses/CC-BY-SA-3.0.txt
+
 --[[
 --vertical base with a glowing fence
 function bld_base_1(lod,scale)