Merge branch 'master' into new_cameras

AUTHORS.txt

@@ -23,6 +23,7 @@ The Pioneer team, past and present, as at 14 September 2012 (alpha 26):
   John Jordan
   Kimmo Kotajärvi
   Konrad Mruk
+  Krzysztof Niedźwiecki
   Lee Reilly
   Lars Westerhoff
   Leonardo Manna
@@ -75,6 +76,10 @@ Pioneer includes the following third-party software:
 
   lookup3.c, by Bob Jenkins, May 2006, Public Domain.
 
+  vcacheopt.h
+  Copyright (C) 2009, Michael Georgoulpoulos
+  Licensed under the MIT licence (see the license block in the file)
+
 Pioneer also makes use of these fine projects. Thanks a lot!
 
   SDL

Changelog.txt

@@ -1,14 +1,25 @@
 Alpha 27
 
+   * New features
+     * The settings screen is now acessible from the main menu (#1187, #1512)
+
    * 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)
 
    * Script changes
      * EventQueue, which was deprecated in alpha 26, has been removed (#1485)
+     * Orbital phase (season) and rotational phase (time) can now be set in custom
+       systems with :rotational_phase_at_start and :orbital_phase_at_start (#1506)
 
    * Internal changes
      * 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)
 
 Alpha 26
 

configure.ac

@@ -5,7 +5,7 @@ dnl Setup
 dnl ###########################################################################
 AC_PREREQ(2.59)
 
-AC_INIT([pioneer], [alpha-27-dev], [pioneer@pioneerspacesim.net])
+AC_INIT([pioneer], [alpha-27-dev], [pioneer-dev@pioneerspacesim.net])
 dnl AC_CONFIG_HEADERS([config.h])
 
 AC_DEFUN([MXE_SETUP], [
@@ -298,6 +298,7 @@ AC_CONFIG_FILES([
 	contrib/lua/Makefile
 	contrib/miniz/Makefile
 	contrib/jenkins/Makefile
+	contrib/vcacheopt/Makefile
 	osx/Makefile
 	win32/Makefile])
 AC_OUTPUT

contrib/Makefile.am

@@ -1 +1 @@
-SUBDIRS = lua miniz jenkins
+SUBDIRS = lua miniz jenkins vcacheopt

contrib/vcacheopt/Makefile.am

@@ -0,0 +1,2 @@
+#  Process this file with automake to produce Makefile.in
+noinst_HEADERS = vcacheopt.h