Merge branch 'master' into factions

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/

Changelog.txt

@@ -2,14 +2,23 @@ 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)
+     * New view modes (Left/Right/Top/Bottom, Cockpit Front/Rear) (#1454)
+       NOTE -- view mode controls are bound to Numeric Keypad by default
+       (they can be rebound in the View tab of the Settings screen)
 
    * 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)
+     * Player cash is shown on the 'Personal' page of the Info (F3) screen (#1525, #1500)
+     * Equipment listed on the Info (F3) screen is split over two columns (#1525, #1527)
 
    * 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)
@@ -20,6 +29,11 @@ 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)
+     * Code to detect supported video modes has moved to Graphics (#1535, #1385)
+     * Cleaned up UI view code for consistency and stability (#1528)
 
 Alpha 26
 

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 \

Quickstart.txt

@@ -9,18 +9,34 @@ the mouse.
 
 The eight main console buttons are activated by the F1-F8 keys or the mouse.
 
-F1: Change view.
+F1: Change view mode (cockpit/external/sidereal)
 F2: Use the map system.
 F3: Look at your own information.
 F4: Select targets, operate autopilot and communicate.
 
+The view direction can be controlled, with keys:
+KP 8: Front Camera / Rotate External/Sidereal Up
+KP 2: Rear Camera / Rotate External/Sidereal Down
+KP 4: Left Camera / Rotate External/Sidereal Left
+KP 6: Right Camera / Rotate External/Sidereal Right
+KP 9: Top Camera
+KP 3: Bottom Camera / Roll External/Sidereal Right
+KP 7: Cockpit view forward
+KP 1: Cockpit view rearward / Roll External/Sidereal Left
++: Zoom in (external/sidereal view only)
+-: Zoom out (external/sidereal view only)
+Home: Reset zoom (sidereal view only)
+
+(NOTE: If you do not have a numeric keypad, please rebind the view direction
+controls from the View tab in the Settings screen)
+
 The next four buttons change function depending on the first four. Hover the
 mouse over them to see what they do.
 
 F5 turns off the autopilot, and changes between manual flight and set speed
-flight
+flight.
 
-To fly your ship manually, the keys are:
+Flight controls are:
 Q: Roll left
 W: Pitch forward
 E: Roll right
@@ -34,13 +50,13 @@ J: Starboard thruster (slide left)
 K: Forward thruster (go backwards)
 L: Port thruster (slide right)
 
-In "set speed" mode, the keys are:
-Q: Roll left
-W: Pitch forward
-E: Roll right
-A: Yaw left
-S: Pitch up
-D: Yaw right
+In manual flight mode, the thrusters only fire when you tell them to.
+In "set speed" mode, the autopilot tries to keep your velocity vector
+in the direction that your vehicle is facing, with a constant speed.
+Thruster controls still work in "set speed" mode, and override the
+autopilot while you hold the thrust key down.
+
+"Set speed" controls:
 Enter: Set speed faster
 RightShift: Set speed slower
 

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 ###########################################################################

data/lang/Catala.txt

@@ -740,9 +740,9 @@ SHIP_IS_FULLY_LADEN
     La vostra nau està completament carregada.
 YOU_DO_NOT_HAVE_ANY_X
     No teniu cap %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
     Vista anterior
-REAR_VIEW
+CAMERA_REAR_VIEW
     Vista posterior
 EXTERNAL_VIEW
     Vista externa

data/lang/Deutsch.txt

@@ -705,9 +705,9 @@ SHIP_IS_FULLY_LADEN
     Ihr Schiff ist voll.
 YOU_DO_NOT_HAVE_ANY_X
     Sie haben keine Waren des Artikels %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
     Sicht nach vorn
-REAR_VIEW
+CAMERA_REAR_VIEW
     Sicht nach hinten
 EXTERNAL_VIEW
     Außenansicht

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
@@ -498,8 +500,8 @@ N_LIGHT_YEARS_N_MAX
     %distance{f.1} light years (%maxdistance{f.1} max)
 SHIP_INFORMATION
     Ship information
-REPUTATION
-    Reputation
+PERSONAL
+    Personal
 MISSIONS
     Missions
 SHIFT
@@ -744,14 +746,38 @@ SHIP_IS_FULLY_LADEN
     Your ship is fully laden.
 YOU_DO_NOT_HAVE_ANY_X
     You do not have any %item.
-FRONT_VIEW
-    Front view
-REAR_VIEW
-    Rear view
+FRONT_COCKPIT_VIEW
+	Front cockpit view
+REAR_COCKPIT_VIEW
+	Rear cockpit view
+CAMERA_FRONT_VIEW
+	Front camera
+CAMERA_REAR_VIEW
+	Rear camera
+CAMERA_LEFT_VIEW
+	Left camera
+CAMERA_TOP_VIEW
+	Top camera
+CAMERA_RIGHT_VIEW
+	Right camera
+CAMERA_BOTTOM_VIEW
+	Bottom camera
+INTERNAL_VIEW
+    Internal view	
 EXTERNAL_VIEW
     External view
 SIDEREAL_VIEW
     Sidereal view
+ROTATE_UP
+	Rotate Up
+ROTATE_DOWN
+	Rotate Down
+ROTATE_LEFT
+    Rotate Left	
+ROTATE_RIGHT
+    Rotate Right
+RESET
+    Reset
 NAVIGATION_STAR_MAPS
     Navigation and star maps
 COMMS

data/lang/Francais.txt

@@ -734,9 +734,9 @@ SHIP_IS_FULLY_LADEN
     Votre vaisseau est rempli.
 YOU_DO_NOT_HAVE_ANY_X
     Vous n'avez aucun %item.
-FRONT_VIEW
+CAMERA_FRONT_VIEW
     Vue avant
-REAR_VIEW
+CAMERA_REAR_VIEW
     Vie arrière
 EXTERNAL_VIEW
     Vue extérieure