Merge branch 'master' into lawAndOrder_to_lua

.gitignore

@@ -64,3 +64,5 @@ gmon.out
 .dirstamp
 result
 *.sgm
+.vs/
+*.user

AUTHORS.txt

@@ -8,9 +8,11 @@ The Pioneer Developers are:
 * Abram Hindle
 * Ae
 * Alan Briggs
+* Alan 'joonicks' Londa
 * Alessandro Giachi
 * Andrew Cook
 * Andrew Copland
+* Anton Korzun
 * Antti Salonen
 * Armin Kretschmer
 * Asier Basagoiti
@@ -30,6 +32,7 @@ The Pioneer Developers are:
 * DerpyHooves
 * Dionisis Kontominas
 * Dmitry Marakasov
+* Edoardo Morandi
 * Emery Hemingway
 * Enric Morales
 * Florian Schmidt
@@ -47,7 +50,9 @@ The Pioneer Developers are:
 * Kimmo Kotajärvi
 * Konrad Mruk
 * Krzysztof Niedźwiecki
+* Kyungdahm Yun
 * Lars Westerhoff
+* Leandro Papi
 * Lee Reilly
 * Leonardo Manna
 * Luca Ganzerla
@@ -64,6 +69,7 @@ The Pioneer Developers are:
 * Pedro Gimeno
 * Peter Kurucz
 * Phil Howlett
+* Pieter Thielens
 * Piotr Gredka
 * PVJeltz
 * Radek Valášek aka vaLin

COMPILING.txt

@@ -5,8 +5,9 @@ Table of Contents
   1.2 Windows - MSVC
   1.3 Windows - Autotools (Linux cross-compile)
   1.4 OS X - Autotools
-  1.5 OSX - XCode 4
-  1.6 Nix - Autotools
+  1.5 OS X - XCode 4
+  1.6 OS X - Homebrew
+  1.7 Nix - Autotools
 2 pioneer-thirdparty
   2.1 Linux - Autotools
   2.2 Windows - MSVC
@@ -25,7 +26,7 @@ Pioneer is known to build on the following platforms and build systems:
 Linux: GNU Autotools with GCC or Clang
 Windows: Microsoft Visual C++ 2013 (Express Edition or Pro)
 Windows: GNU Autotools with MXE (MinGW GCC) (cross-compile on Linux)
-OS X: GNU Autotools or XCode 4
+OS X: XCode 4 or Homebrew or GNU Autotools
 
 The Autotools build system is usually the most up-to-date, and is what is used
 to produce the Linux and Windows builds. The others typically lag behind,
@@ -149,8 +150,8 @@ Note: Compiling from source this way isn't recommended as it doesn't allow you
       bundle). It also isn't the 'Apple way', To do that you need to use XCode.
 
 
-1.5 OSX - XCode 4
------------------
+1.5 OS X - XCode 4
+------------------
 
 * The XCode project isn't as up to date as the 'autotools' method and may
   be broken.
@@ -161,7 +162,26 @@ 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).
 
 
-1.6 Nix - Autotools
+1.6 OS X - Homebrew
+-------------------
+
+1. Install Homebrew package manager (http://brew.sh/) if you don't have one yet.
+
+2. Build and install pioneer. Required dependencies will be installed together.
+
+     brew install homebrew/games/pioneer
+
+   Or you may want to tap homebrew-games first and then install.
+
+     brew tap homebrew/games
+     brew install pioneer
+
+   If you want master branch from GitHub, add '--HEAD' option.
+
+     brew install --HEAD pioneer
+
+
+1.7 Nix - Autotools
 -------------------
 
 1. Install the development environment using the included expressions.

Changelog.txt

@@ -1,3 +1,78 @@
+October 2015
+   * New Features
+     * Fade orbits faster and darker (#3469)
+     * Commodity Market rewrite (#3467)
+     * OS X Homebrew Build script (#3447)
+     * Make trade analyzer module into a software module (#3474)
+
+   * Fixes
+     * Miscellaneous warnings fixes (#3472)
+     * Commodity language fix (#3476)
+     * Split the flightstate DOCKING into an UNDOCKING state as well (#3481)
+     * Account for the fuel mass in hyperspace range calculation (#3489)
+     * Bad Terrain, no cookie! (#3490)
+
+   * Internal Changes
+     * Exposing full color values instead of only alphas in skin.ini (#3486)
+     * GLSL preprocessor includes (#3488)
+     * Simplified Star Shader (#3487)
+     * Change forced time acceleration around ships (#3445)
+     * Present a clearer warning to the user if OpenGL fails to initialise (#3496)
+     * Eclipse tidy (#3501)
+
+September 2015
+   * New Features
+     * Control how many stars in the sky (#3431)
+     * Two state hyperspace button (#3438)
+     * Terrain detail textures (#3448)
+     * Progress bar during start up better scaled (#3261, #3462)
+     * Orbit fading (#3460)
+
+   * Fixes
+     * Fix undefined symbols for static const members (#3446)
+     * Resolve Detail Texturing abort (#3452)
+     * Fix compilation issue due to BG_STARS_MAX/MIN (#3457)
+     * Fix empty crew for hire advert (#3465)
+     * Fix crew for hire load glitch (#3468)
+     * Fix Crew-for-hire duplicate/disappear (#3466)
+
+   * Internal Changes
+     * Remove planetary scaling during rendering (#3434)
+     * Remove the animation Interpolate optimisation (#3435)
+     * Add license badge to README, markdown now supports it (#3464)
+
+August 2015
+   * New Features
+     * Orbital planner got some new features (#3426)
+
+   * Fixes
+     * Fix NAN for planned orbit (#3437)
+     * Fix math typo (#3440)
+
+   * Internal Changes
+     * Changed/removed some non-portable C++11 usage (#3444)
+
+July 2015
+   * New Features
+     * Add first initial support for Arab fonts (#3416)
+     * New (smaller) space station added (#3414)
+     * Allow custom stations to have realistic orbit heights (#3410)
+     * New SensorType API and BodyScanner equipment (#3287, #3396)
+
+   * Fixes
+     * Proposed fix for the MINGW32 issue #3409 (#3418)
+     * Fixed color of labels starting with empty strings (#3425)
+
+   * Internal Changes
+     * Numerous optimisations (#3419)
+     * Remove output spamming messages (#3421)
+     * Sort terrain gen (#3420)
+     * Inactivate BodyScanner equipment testing code (#3422)
+     * Drawing optimisations (#3424)
+     * Render far away (#3428)
+     * Modelviewer refactor (#3429)
+     * Cleanup build warnings (#3433)
+
 June 2015
    * New Features
      * Allow up to 3 orbits a spacestation can occupy (#3392)

Modelviewer.txt

@@ -7,32 +7,28 @@ end-user use.
 
 Usage:
 ~~~~~~
-modelviewer <width> <height> <model>
+pioneer -mv <model>
 
-<width> 	- screen width (default 800)
-<height>	- screen height (default 600)
 <model>		- name of the model defined in lua
 
 	Example:
-	./modelviewer 1024 768 interdictor
-		- will load the model interdictor with screen resolution 1024x768
+	./pioneer -mv interdictor
+		- will load the model interdictor
 
-	./modelviewer
+	./pioneer -mv
 		- will launch modelviewer, prompting for a model name.
 
 Keyboard commands:
 ~~~~~~~~~~~~~~~~~~
 
-<cursor>			- Rotate the model
+<cursor>		- Rotate the model
 <shift> + <cursor>	- Rotate the camera
 <=> or <PgUp>		- Zoom In
 <-> or <PgDown>		- Zoom Out
-<c>					- Toggle view between normal mesh and collision mesh
-<r>					- Reset thruster and anim sliders
-<m>					- Rebuild collision mesh
-<p>					- Toggle performance test - CAUTION: this WILL cause 
-					  slowness
-<ESC>				- Exit model viewer, prompt for new name or ESC to Quit.
+<c>			- Toggle view between normal mesh and collision mesh
+<r>			- Reset thruster and anim sliders
+<m>			- Rebuild collision mesh
+<ESC>			- Exit model viewer, prompt for new name or ESC to Quit.
 
 Sliders:
 ~~~~~~~~
@@ -49,5 +45,3 @@ Angular thrust:
 Animations:
 	0 - Landing gear animation
 	(remaining unused)
-
-

README.md

@@ -1,3 +1,5 @@
+[![License GPLv3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
+
 # Pioneer Space Simulator
 
 Pioneer is a space adventure game set in the Milky Way galaxy at the turn of

contrib/json/JsonUtils.cpp

@@ -1,7 +1,9 @@
 // Copyright © 2008-2015 Pioneer Developers. See AUTHORS.txt for details
 // Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
 
+#ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES
+#endif
 #include <cmath>
 #include "JsonUtils.h"
 #include "../../src/utils.h"

data/fonts/ConsoleFont.json

@@ -15,7 +15,8 @@
             [ "0x0500", "0x0527" ],
             [ "0x2DE0", "0x2DFF" ],
             [ "0xA640", "0xA697" ],
-            [ "0xA69F", "0xA69F" ]
+            [ "0xA69F", "0xA69F" ],
+			[ "0x0600", "0x06FF" ]
          ]
       },
       {

data/fonts/GuiFont.json

@@ -17,7 +17,8 @@
             [ "0x0500", "0x0527" ],
             [ "0x2DE0", "0x2DFF" ],
             [ "0xA640", "0xA697" ],
-            [ "0xA69F", "0xA69F" ]
+            [ "0xA69F", "0xA69F" ],
+			[ "0x0600", "0x06FF" ]
          ]
       },
       {

data/fonts/OverlayFont.json

@@ -18,7 +18,8 @@
             [ "0x0500", "0x0527" ],
             [ "0x2DE0", "0x2DFF" ],
             [ "0xA640", "0xA697" ],
-            [ "0xA69F", "0xA69F" ]
+            [ "0xA69F", "0xA69F" ],
+			[ "0x0600", "0x06FF" ]
          ]
       },
       {

data/fonts/UIFont.json

@@ -15,7 +15,8 @@
             [ "0x0500", "0x0527" ],
             [ "0x2DE0", "0x2DFF" ],
             [ "0xA640", "0xA697" ],
-            [ "0xA69F", "0xA69F" ]
+            [ "0xA69F", "0xA69F" ],
+			[ "0x0600", "0x06FF" ]
          ]
       },
       {

data/fonts/UIHeadingFont.json

@@ -15,7 +15,8 @@
             [ "0x0500", "0x0527" ],
             [ "0x2DE0", "0x2DFF" ],
             [ "0xA640", "0xA697" ],
-            [ "0xA69F", "0xA69F" ]
+            [ "0xA69F", "0xA69F" ],
+			[ "0x0600", "0x06FF" ]
          ]
       },
       {

data/fonts/UIMonoFont.json

@@ -15,7 +15,8 @@
             [ "0x0500", "0x0527" ],
             [ "0x2DE0", "0x2DFF" ],
             [ "0xA640", "0xA697" ],
-            [ "0xA69F", "0xA69F" ]
+            [ "0xA69F", "0xA69F" ],
+			[ "0x0600", "0x06FF" ]
          ]
       },
       {