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

…nto LUT-textures # Conflicts: # data/shaders/opengl/gen-gas-giant-colour.frag # data/shaders/opengl/geosphere_terrain.frag # data/shaders/opengl/geosphere_terrain.vert
pioneerspacesim · Oct 24, 2020 · 6845347 · 6845347
2 parents 28a559e + f0855a3
commit 6845347
Show file tree

Hide file tree

Showing 236 changed files with 4,363 additions and 2,885 deletions.
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -1,34 +1,40 @@
-{
-  "configurations": [
-    {
-      "name": "x64-Debug",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "variables": []
-    },
-    {
-      "name": "x64-Release",
-      "generator": "Ninja",
-      "configurationType": "RelWithDebInfo",
-      "buildRoot": "${projectDir}\\out\\build\\${name}",
-      "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "variables": [
+{
+    "configurations": [
         {
-          "name": "CMAKE_BUILD_TYPE",
-          "value": "RelWithDebInfo",
-          "type": "STRING"
+            "name": "x64-Debug",
+            "generator": "Ninja",
+            "configurationType": "Debug",
+            "inheritEnvironments": [ "msvc_x64_x64" ],
+            "buildRoot": "${projectDir}\\out\\build\\${name}",
+            "installRoot": "${projectDir}\\out\\install\\${name}",
+            "cmakeCommandArgs": "",
+            "buildCommandArgs": "",
+            "ctestCommandArgs": "",
+            "variables": []
+        },
+        {
+            "name": "x64-Release",
+            "generator": "Ninja",
+            "configurationType": "Release",
+            "buildRoot": "${projectDir}\\out\\build\\${name}",
+            "installRoot": "${projectDir}\\out\\install\\${name}",
+            "cmakeCommandArgs": "",
+            "buildCommandArgs": "",
+            "ctestCommandArgs": "",
+            "inheritEnvironments": [ "msvc_x64_x64" ],
+            "variables": []
+        },
+        {
+            "name": "x64-Profiling",
+            "generator": "Ninja",
+            "configurationType": "RelWithDebInfo",
+            "buildRoot": "${projectDir}\\out\\build\\${name}",
+            "installRoot": "${projectDir}\\out\\install\\${name}",
+            "cmakeCommandArgs": "-DPROFILER_ENABLED=1",
+            "buildCommandArgs": "",
+            "ctestCommandArgs": "",
+            "inheritEnvironments": [ "msvc_x64_x64" ],
+            "variables": []
         }
-      ]
-    }
-  ]
-}
+    ]
+}
diff --git a/COMPILING.txt b/COMPILING.txt
@@ -120,15 +120,14 @@ questions are welcome anytime.
 
 3. Go to File->Open->CMake and select pioneer/CMakeLists.txt
 
-4. If a Release build is desired, select 'Manage Configurations' under the build type,
-   which will default to x64-Debug and add x64-Release.
+4. Select the appropriate build type (x64-Debug or x64-Release) under the configuration
+   drop down on the main toolbar, located next to the run button. 
 
-5. Select the appropriate build type.
+5. Build the project (Build->Build All).
 
-6. Buid the project (Build->Build All).
-
-7. Pioneer can be run and debugged by selecting 'pioneer.exe' on the 
-   'Select Startup Item' toolbar button, and then clicking run.
+6. Pioneer can be run and debugged by selecting 'pioneer.exe' on the 
+   'Select Startup Item' menu (click the small down arrow on the run button), and then clicking run.
+   Be sure to select 'pioneer.exe' and not 'pioneer.exe (install)'.
 
 
 1.5 OS X - Homebrew

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,19 @@
+October 2020
+   * New Features
+     * Ship-specific atmospheric pressure limits (#4958)
+     * Make thruster upgrades availabile based on tech level (#4956)
+
+   * Internal Changes
+     * Optimize body list container in Space.cpp (#4957)
+     * Use an offscreen buffer as the primary rendering target (#4974)
+     * Use Reverse-Z depth buffer, drop logZ hack (#4975)
+     * Add PlanetsGravity processor for GalaxyStats tool (#4971)
+     * Add theme color display/editor to debug menu (#4979)
+
+   * Fixes
+     * Fix Flight Log crashes (#4973)
+     * Update MSVC CMake configuration and instructions (#4980)
+
 September 2020
    * New Features
      * Add external camera interpolation and spring (#4955)
@@ -6,6 +22,8 @@ September 2020
    * Internal Changes
      * Cleanup Renderer API to Remove Fixed-Function State (#4947)
      * Add pigui handlers for PiGuiViews (#4952)
+     * Collapse PiGui namespaces, load pigui theme from Lua (#4963)
+     * Clean up Lua PiGui code, split into multiple modules (#4964)
 
    * Fixes
      * Show the ship's translated name in savegame stats (#4953)