Merge branch 'master' into autopilot-v3

Conflicts:
	src/Camera.cpp
	src/DeathView.cpp

AUTHORS.txt

@@ -22,6 +22,7 @@ As of 14 December 2012 (alpha 29), the Pioneer Developers are:
 * Dionisis Kontominas
 * Enric Morales
 * Fran Morton
+* Frank Klippenberg
 * Gareth Allnutt
 * Gernot
 * Jan Olsina
@@ -43,6 +44,7 @@ As of 14 December 2012 (alpha 29), the Pioneer Developers are:
 * Phil Howlett
 * Piotr Gredka
 * Robert Norris
+* Roland Mas
 * Sean Bailey
 * Simon Chopin
 * Stefan Kapusniak

COMPILING.txt

@@ -46,7 +46,7 @@ Linux - Autotools
    If your platform doesn't have assimp 3.0, you'll need to build it from
    source. Its available in pioneer-thirdparty, see below.
 
-2. Run ./bootstrap.sh to generate your 'configure' file
+2. Run ./bootstrap to generate your 'configure' file
 
 3. Run ./configure to configure the build. If you're using the
    pioneer-thirdparty repository, pass
@@ -87,7 +87,7 @@ Windows - Autotools (Linux cross-compile)
 
 2. Prepare the pioneer-thirdparty repository. See below.
 
-3. Now you can build Pioneer. Run ./bootstrap.sh to generate your 'configure'
+3. Now you can build Pioneer. Run ./bootstrap to generate your 'configure'
    file.
 
 4. Run configure to configure the build:
@@ -100,10 +100,14 @@ Windows - Autotools (Linux cross-compile)
 OS X - Autotools
 ----------------
 
-1. You will need the following libraries installed. The best method I found
+1. Install XCode (free download from apple). This will install the required
+   compilers and other commandline tools.
+
+2. You will need the following libraries installed. The best method I found
    was to install macports (http://www.macports.org/) and install the
-   following:
+   following ports (sudo port install xxxx):
 
+     assimp
      pkgconfig
      freetype
      libsdl
@@ -112,33 +116,33 @@ OS X - Autotools
      glew
      libsigcxx2
 
-2. Run ./bootstrap.sh to generate your 'configure' file
+3. Run ./bootstrap to generate your 'configure' file
 
-3. By default the OpenGL frameworks don't seem to be visible the 'automake'
+4. By default the OpenGL frameworks don't seem to be visible to 'automake'
    way so I did a few tricks to get it working:
 
    Create a symlink from the OpenGL framework to your /usr/local/include 
    directory
 
      sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/ /usr/local/include/GL
 
-4. Instead of running ./configure run it with this command line:
+5. Instead of running ./configure run it with this command line:
 
      LDFLAGS="-L/System/Library/Frameworks/OpenGL.framework/Libraries -L/System/Library/Frameworks/GLUT.framework" ./configure
 
-5. Now you can run Make as per normal. :)
+6. Now you can run make as per normal. :)
 
+Note: Compiling from source this way isn't recommended as it doesn't allow you
+      to 'install' the application into a different location (pioneer.app
+      bundle). It also isn't the 'Apple way', To do that you need to use XCode.
 
 OSX - XCode 4
 -------------
 
-There is currently an Xcode project located in the ./osx directory. This is
-the project setup that I currently use, and it has not been tested on a
-different system. I have already setup the paths and project settings based on
-the libraries and headers already setup the 'GNU way' as stated above.  This
-saves many #ifdef's that would have to be riddled through the code just
-because of Xcode.
-
+The latest XCode project files are located in ./osx. Simply build the
+aplication bundle. The XCode project uses the mac port libraries that you
+have installed above. Once the pioneer.app bundle is complete you can move it
+around where you like (/Applications is a nice place for it).
 
 
 pioneer-thirdparty
@@ -177,3 +181,9 @@ Windows - Autotools (Linux cross-compile)
 
 3. Run make <package> to compile and prepare the named package for use with
    Pioneer, or just run make alone to build everything.
+
+OSX
+---
+
+- pioneer-thirdparty currently not required.
+

Changelog.txt

@@ -1,28 +1,57 @@
 Alpha 30
 
    * New features
-     * New model system (SGModel) (#1676, #1208, #813)
+     * New model system (SGModel) (#1676, #1208, #813, #1852)
+     * Rotation damping icon and control on the panel (#1842, #1837)
      * OSX: Hold the option key down when launching pioneer.app to launch the
        model viewer instead (#1803)
 
    * Minor changes and tweaks
      * Don't allocate projectile geometry for every projectile. Huge
        performance increase during combat (#1822)
+     * Main menu now has keyboard shortcuts again (#1821)
+     * Player's name now updates during editing in Personal Information view (#1845)
+     * Rondel system moved further away from Sol and surrounding stars (#1861, #1815)
+     * Star fade-in has been adjusted to make stars less visible in daytime (#1881)
 
    * Script changes
      * New attribute StarSystem.explored (#1793, #1797)
+     * Custom systems can now define gravpoints (#1701, #1074)
 
    * Fixes
      * Interpret galaxy density bitmap as unsigned values (#1818, #1813)
      * Invert mouse cursor movement in rear view (#1820)
+     * Missions no longer vanish from view when other missions are completed
+       (#1824, #1826, #1854, #1856)
+     * Fix crash when switching away from settings screen after death (#1844,
+       #1698, #1742)
+     * Move SystemView time control buttons above the dash to work around
+       input priority problems (#1853, #1851)
+     * Fix occasional bug that could leave a trailing slash on some filesystem
+       paths (#1843, #1486)
+     * Fix division-by-zero bugs in missile AI (#1873, #1872)
+     * Fix loading of player's criminal record and fines (#1877, #1874)
+     * Selected systems are now always shown in the sector view (#1864)
 
    * UI changes
      * Improved appearance of Dropdown widget (#1789, #1766)
      * Fix layout of non-contributing widgets inside pack boxes (#1789)
+     * UI widgets can now have keyboard shortcuts (#1821, #1841, #1840)
 
    * Internal changes
      * Improvements in text rendering performance (#1791)
      * Move MSVC headers and libs to pioneer-thirdparty repository (#1807)
+     * Removed legact MissionStatus code from core (#1824)
+     * Optimisation in access to ship type information (#1827)
+     * Add support for high precision timing and floating-point exceptions (#1836, #1846)
+     * Enable floating-point exceptions during AI processing (#1838)
+     * Lua methods can be marked "protected", stopping them being called by
+       user-supplied scripts and mods (#1706, #1869)
+     * Rotation damping code cleaned up (#1866)
+     * Various minor cleanups (#1867)
+     * Allow point sprites to be rendered with different alpha blending modes (#1880)
+     * Unknown tokens for Lua translations are no longer treated as errors (#1865, #1862)
+     * Rename terrain noise macros to avoid global namespace polliution (#1883)
 
 Alpha 29
 

configure.ac

@@ -251,7 +251,10 @@ fi
 dnl Optionally use external liblua
 AC_ARG_WITH([external-liblua], AS_HELP_STRING([--with-external-liblua], [Use external liblua in place of our internal copy]), [], [with_external_liblua=no; HAVE_LUA=no])
 if test "$with_external_liblua" = yes; then
-  PKG_CHECK_MODULES([LUA], [lua >= 5.2], [HAVE_LUA=yes], [AC_MSG_ERROR([External liblua was requested but is not available])])
+  PKG_CHECK_MODULES([LUA], [lua >= 5.2], [HAVE_LUA=yes], [foundlua=no])
+  if test "$foundlua" = no; then
+    PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], [HAVE_LUA=yes], [AC_MSG_ERROR([External liblua was requested but is not available])])
+  fi
 fi
 AM_CONDITIONAL([HAVE_LUA], [test "$HAVE_LUA" = yes])
 case "$host" in

data/lang/English.txt

@@ -588,8 +588,8 @@ DECREASE_SCAN_RANGE
 	Decrease scanner range
 TOGGLE_LUA_CONSOLE
     Toggle Lua console
-TOGGLE_MANUAL_ROTATION
-	Manual rotation
+TOGGLE_ROTATION_DAMPING
+	Toggle rotation damping
 TOGGLE_HUD_MODE
     Toggle HUD mode
 JOYSTICK_INPUT
@@ -782,6 +782,10 @@ STAR_SYSTEM_INFORMATION
     Star system information
 GALACTIC_VIEW
     Galactic view
+ROTATION_DAMPING_ON
+	Rotation damping on
+ROTATION_DAMPING_OFF
+	Rotation damping off
 NO_ALERT
     No alert
 SHIP_NEARBY

data/lang/Magyar.txt

@@ -8,7 +8,7 @@ LEGAL_STATUS
 CARGO_SPACE
     Raktér méret
 ITEM
-    Item
+    Tárgy
 SHIP
     Hajó
 PRICE
@@ -589,7 +589,7 @@ POOR
 AVERAGE
     Átlagos
 ABOVE_AVERAGE
-    Átleg feletti
+    Átlag feletti
 COMPETENT
     Versenyképes
 DANGEROUS
@@ -707,7 +707,7 @@ BINARY_SYSTEM
 ENABLED_AUTOMATIC_SYSTEM_SELECTION
     Automata rendszerválasztás engedélyezve.
 DISABLED_AUTOMATIC_SYSTEM_SELECTION
-    Automata rendsszerválasztás kikapcsolva.
+    Automata rendszerválasztás kikapcsolva.
 FUEL_SCOOP_ACTIVE_N_TONNES_H_COLLECTED
     Üzemanyagszívó aktív. Jelenleg már %quantity tonna hidrogéned van.
 CARGO_SCOOP_ACTIVE_1_TONNE_X_COLLECTED
@@ -1025,7 +1025,7 @@ RADIUS
 SEMI_MAJOR_AXIS
     Félnagytengely
 TIME_POINT
-    Time point:
+    Idő pont:
 UNEXPLORED_SYSTEM_NO_SYSTEM_VIEW
     Felfedezetlen rendszer. Rendszernézet nem elérhető.
 WHEELS_ARE_UP

data/lang/Polski.txt

@@ -588,8 +588,8 @@ DECREASE_SCAN_RANGE
     Zmniejsza zasięg skanera
 TOGGLE_LUA_CONSOLE
     Aktywacja konsoli
-TOGGLE_MANUAL_ROTATION
-    Rotacja manualna
+TOGGLE_ROTATION_DAMPING
+    Tłumienie rotacji
 TOGGLE_HUD_MODE
     Zmiana trybu HUD
 JOYSTICK_INPUT
@@ -782,6 +782,10 @@ STAR_SYSTEM_INFORMATION
     Informacja o systemie
 GALACTIC_VIEW
     Galaktyka
+ROTATION_DAMPING_ON
+    Tłumienie rotacji włączone
+ROTATION_DAMPING_OFF
+    Tłumienie rotacji wyłączone
 NO_ALERT
     Brak alarmu
 SHIP_NEARBY

data/lang/Spanish.txt

@@ -588,8 +588,8 @@ DECREASE_SCAN_RANGE
     Reducir rango del Scanner
 TOGGLE_LUA_CONSOLE
     ON/OFF Lua Console
-TOGGLE_MANUAL_ROTATION
-    Rotación manual
+TOGGLE_ROTATION_DAMPING
+    Rotación amortiguada
 TOGGLE_HUD_MODE
     HUD ON/OFF
 JOYSTICK_INPUT