Automated build commit

2026-11-08 07:28:22 -10:00 · 2023-02-11 12:13:50 +00:00
1674 changed files with 176087 additions and 196515 deletions
@@ -4,28 +4,20 @@ modernize-*,\
 -modernize-avoid-c-arrays,\
 -modernize-make-unique,\
 -modernize-raw-string-literal,\
-modernize-use-default-member-init,\
-modernize-use-nodiscard,\
 -modernize-use-trailing-return-type,\
 -modernize-use-using,\
 performance-*,\
-performance-no-int-to-ptr,\
 -performance-type-promotion-in-math-fn,\
 misc-*,\
-misc-include-cleaner,\
 -misc-macro-parentheses,\
 -misc-misplaced-widening-cast,\
-misc-no-recursion,\
 -misc-non-private-member-variables-in-classes,\
 -misc-static-assert,\
 -misc-unused-parameters,\
-misc-use-anonymous-namespace,\
 readability-*,\
 -readability-avoid-const-params-in-decls,\
 -readability-else-after-return,\
-readability-function-cognitive-complexity,\
 -readability-function-size,\
-readability-identifier-length,\
 -readability-identifier-naming,\
 -readability-implicit-bool-conversion,\
 -readability-inconsistent-declaration-parameter-name,\
@@ -37,13 +29,10 @@ readability-*,\
 "
 WarningsAsErrors: ''
 HeaderFilterRegex: 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$'
+AnalyzeTemporaryDtors: false
 CheckOptions:
  - key:          'misc-assert-side-effect.AssertMacros'
    value:        'assert,Assert,Assertion'
-  - key:          'misc-const-correctness.AnalyzeValues'
-    value:        'false'
-  - key:          'misc-const-correctness.TransformValues'
-    value:        'false'
  - key:          'modernize-use-emplace.ContainersWithPushBack'
    value:        'std::vector;std::deque;std::list;SCP_vector;SCP_deque;SCP_list'
  - key:          'readability-braces-around-statements.ShortStatementLines'
@@ -1,6 +1,14 @@

+cmake/ @asarium
+
 ci/ @asarium @z64555

+code/executor/ @asarium
+
+code/scpui/ @asarium
+
+code/scripting/ @asarium
+
 code/controlconfig/ @z64555

 code/model/modelanimation*.* @bmagnu
@@ -6,23 +6,32 @@ on:
      - 'nightly_*'

 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 5.12.9

 jobs:
  build_linux:
    strategy:
      matrix:
        configuration: [FastDebug, Release]
-        os: [ubuntu-latest, ubuntu-24.04-arm]
-        include:
-          - os: ubuntu-latest
-            arch: x86_64
-          - os: ubuntu-24.04-arm
-            arch: arm64
    name: Linux
-    runs-on: ${{ matrix.os }}
-    container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
+    runs-on: ubuntu-latest
+    container: ghcr.io/scp-fs2open/linux_build:sha-8a6bbbe
    steps:
+      # - name: Cache Qt
+        # id: cache-qt-lin
+        # uses: actions/cache@v1
+        # with:
+          # path: ${{ github.workspace }}/../Qt
+          # key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
+      # - name: Install Qt
+        # uses: jurplel/install-qt-action@v2
+        # with:
+          # version: ${{ env.QT_VERSION }}
+          # dir: ${{ github.workspace }}/..
+          # cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
+          # setup-python: 'false'
+          # aqtversion: ==1.1.3
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
@@ -30,8 +39,7 @@ jobs:
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: gcc-9
-          ENABLE_QTFRED: OFF
+          COMPILER: gcc-5
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -51,18 +59,15 @@ jobs:
          CONFIGURATION: ${{ matrix.configuration }}
        run: $GITHUB_WORKSPACE/ci/linux/generate_appimage.sh $GITHUB_WORKSPACE/build/install
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
-          name: linux-${{ matrix.configuration }}-${{ matrix.arch }}
+          name: linux-${{ matrix.configuration }}
          path: ${{ github.workspace }}/build/install/*.AppImage
  linux_zip:
    name: Build Linux distribution zip
    needs: build_linux
    runs-on: ubuntu-latest
    container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
-    strategy:
-      matrix:
-        arch: [x86_64, arm64]
    steps:
      - uses: actions/checkout@v1
        name: Checkout
@@ -70,23 +75,17 @@ jobs:
          submodules: true
          fetch-depth: '0'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
-          name: linux-Release-${{ matrix.arch }}
+          name: linux-Release
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: linux-FastDebug-${{ matrix.arch }}
+          name: linux-FastDebug
          path: builds
-      - name: Fix permissions
-        working-directory: ./builds
-        shell: bash
-        run: chmod 755 *.AppImage
      - name: Create Distribution package
        working-directory: ./builds
-        env:
-          ARCH: ${{ matrix.arch }}
        run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Linux
      - name: Upload result package
        working-directory: ./builds
@@ -104,7 +103,7 @@ jobs:
        arch: [Win32, x64]
        simd: [SSE2]
    name: Windows
-    runs-on: windows-2022
+    runs-on: windows-2019
    steps:
      - uses: actions/checkout@v1
        name: Checkout
@@ -134,12 +133,7 @@ jobs:
          # arch: win64_msvc2017_64
          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
          # aqtversion: ==0.8
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
+
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
@@ -150,19 +144,11 @@ jobs:
          mkdir build
          cd build

-          if [ "$ARCHITECTURE" = "Win32" ]; then
-              cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
-                -DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
-                -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
-                -DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
-                -G "Visual Studio 16 2019" -T "v142" ..
-          else
-              cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
-                -DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
-                -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
-                -DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
-                -G "Visual Studio 16 2019" -T "v142" ..
-          fi
+          cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
+            -DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$SIMD" \
+            -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
+            -DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
+            -G "Visual Studio 16 2019" -T "v142" ..
      - name: Compile
        working-directory: ./build
        env:
@@ -179,7 +165,7 @@ jobs:
        shell: bash
        run: ./bin/$CONFIGURATION/unittests --gtest_shuffle
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: windows-${{ matrix.configuration }}-${{ matrix.arch }}-${{ matrix.simd }}
          path: ${{ github.workspace }}/build/install/*
@@ -199,12 +185,12 @@ jobs:
          submodules: true
          fetch-depth: '0'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
          name: windows-Release-${{ matrix.arch }}-${{ matrix.simd }}
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: windows-FastDebug-${{ matrix.arch }}-${{ matrix.simd }}
          path: builds
@@ -230,7 +216,7 @@ jobs:
      matrix:
        configuration: [FastDebug, Release]
        compiler: [clang]
-        arch: [x86_64, arm64]
+        arch: [x86_64]
    name: Mac
    runs-on: macos-latest
    steps:
@@ -249,17 +235,12 @@ jobs:
          # setup-python: 'false'
          # aqtversion: ==1.1.3
          # py7zrversion: '==0.19.*'
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
          submodules: true
          fetch-depth: 0
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
      - name: Set up test version
        shell: bash
        run: |
@@ -272,7 +253,6 @@ jobs:
          COMPILER: ${{ matrix.compiler }}
          ARCHITECTURE: ${{ matrix.arch }}
          JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
-          ENABLE_QTFRED: OFF
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -281,39 +261,21 @@ jobs:
        working-directory: ./build
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          ARCH: ${{ matrix.arch }}
          XDG_RUNTIME_DIR: /root
        run: $GITHUB_WORKSPACE/ci/linux/run_tests.sh
-      - name: Sign builds
-        working-directory: ./build/bin
-        run: |
-          # make sure OpenAL framework is signed
-          find . -name OpenAL -type f | while read xx; do codesign --force -s - $xx; done
-          find . -name OpenAL.framework -type d | while read xx; do codesign --force -s - $xx; done
-          # make sure dylibs are signed
-          find . -name \*.dylib -type f | while read xx; do codesign --force -s - $xx; done
-          # sign binaries
-          find . -perm +111 -type f | grep MacOS | while read xx; do codesign --force -s - $xx; done
-          # sign apps
-          find . -name \*.app -maxdepth 1 | while read xx; do codesign --force -s - $xx; done
      - name: Package build result
-        working-directory: ./build/bin
-        # Use GNU tar here (part of runner image) to avoid weird corruption bug with bsdtar
-        # Ref: https://github.com/actions/runner-images/issues/2619
-        run: gtar -cvzf macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz *.app
+        working-directory: ./build
+        run: cd bin && tar -cvzf macos-build.tar *.app
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
-          name: mac-${{ matrix.configuration }}-${{ matrix.arch }}
-          path: ${{ github.workspace }}/build/bin/macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz
+          name: mac-${{ matrix.configuration }}
+          path: ${{ github.workspace }}/build/bin/macos-build.tar
  mac_zip:
    name: Build Mac distribution zip
    needs: build_mac
    runs-on: ubuntu-latest
    container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
-    strategy:
-      matrix:
-        arch: [x86_64, arm64]
    steps:
      - uses: actions/checkout@v2
        name: Checkout
@@ -322,24 +284,17 @@ jobs:
          fetch-depth: '0'
          ref: '${{ github.ref }}'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: mac-Release-${{ matrix.arch }}
+          name: mac-Release
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: mac-FastDebug-${{ matrix.arch }}
+          name: mac-FastDebug
          path: builds
-      - name: Unpack builds
-        working-directory: ./builds
-        run: |
-          tar -xvzf macos-build-Release-${{ matrix.arch }}.tgz
-          tar -xvzf macos-build-FastDebug-${{ matrix.arch }}.tgz
      - name: Create Distribution package
        working-directory: ./builds
-        env:
-          ARCH: ${{ matrix.arch }}
        run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Mac
      - name: Upload result package
        working-directory: ./builds
@@ -6,7 +6,7 @@ on:
      - 'release_*'

 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 5.12.9

 jobs:
  create_release:
@@ -41,28 +41,62 @@ jobs:
        # Run this job for each configuration
        # The current config running is accesible with `matrix.configuration`
        configuration: [FastDebug, Release]
-        os: [ubuntu-latest, ubuntu-24.04-arm]
-        include:
-          - os: ubuntu-latest
-            arch: x86_64
-          - os: ubuntu-24.04-arm
-            arch: arm64
    name: Linux
    needs: create_release   # Don't run this job until create_release is done and successful
-    runs-on: ${{ matrix.os }}
-    container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
+    runs-on: ubuntu-latest
+    container: ghcr.io/scp-fs2open/linux_build:sha-8a6bbbe
    steps:
+      # - name: Cache Qt
+        # id: cache-qt-lin
+        # uses: actions/cache@v1
+        # cache the Qt directory so we don't have to reinstall it every time
+        # cache.inputs:
+        #   path - A list of files, directories, and wildcard patterns to cache and restore. See @actions/glob for supported patterns.
+        #   key - An explicit key for restoring and saving the cache
+        #   restore-keys - An ordered list of keys to use for restoring the cache if no cache hit occurred for key
+        # cache.outputs:
+        #   cache-hit   true when an exact match was found for the key, false otherwise.
+        # with:
+          # path: ${{ github.workspace }}/../Qt
+          # key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
+      # - name: Install Qt
+        # uses: jurplel/install-qt-action@v2
+        # installs Qt in the action workflow
+        # install-qt-action.inputs:
+        #   version     desired qt version to install
+        #   host        Host platform of Qt, default to platform used by runs-on
+        #   target      target platform of Qt, default to desktop
+        #   arch        target architecture of Qt, only used for windows or android builds
+        #   dir         root dir Qt will be installed to
+        #   install-deps    if true, auto-install dependencies on linux. Default true
+        #   modules     whitespace delimited list string of additional addon modules to install
+        #   archives    whitespace delimited list string of Qt archives to install
+        #   cached      if true, Don't download Qt but set ENVARs; use with cache.outputs.cache-hit
+        #   setup-python    Set to false to skip using setup-python to find/download a valid python version
+        #   set-env     if true, set ENVARs; default = false
+        #   aqtversion  version of aqtinstall to use; default = 2.0.0
+        #   py7zrversion    version of py7zr to use; default = 0.16.1
+        #   extra       additional arguments to pass to aqinstall
+        # ENVARS set:
+        #   Qt5_DIR / Qt6_DIR
+        #   Qt bin dir appended to PATH
+        #   QT_PLUGIN_PATH, QML2_IMPORT_PATH, PKG_CONFIG_PATH, LD_LIBRARY_PATH
+        # with:
+          # version: ${{ env.QT_VERSION }}
+          # dir: ${{ github.workspace }}/..
+          # cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
+          # setup-python: 'false'
+          # aqtversion: ==1.1.3
+
      - uses: actions/checkout@v1
        # checks-out your repository under $GITHUB_WORKSPACE, so your workflow can access it.
        name: Checkout
        with:
          submodules: true  # `true` to checkout submodules, `recursive` to recursively checkout submodules
-          ref: '${{ github.ref }}'
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: gcc-9
-          ENABLE_QTFRED: OFF
+          COMPILER: gcc-5
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -82,7 +116,7 @@ jobs:
          CONFIGURATION: ${{ matrix.configuration }}
        run: $GITHUB_WORKSPACE/ci/linux/generate_appimage.sh $GITHUB_WORKSPACE/build/install
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        # Upload the url file for use with other runners
        # upload-artifact.inputs:
        #   if-no-files-found=warn  What to do if path fails to find any files.
@@ -93,49 +127,39 @@ jobs:
        #       0     Use default retention policy of the repo
        #       1~90  Min 1, Max 90 days to keep the artifact unless changed by repo settings page
        with:
-          name: linux-${{ matrix.configuration }}-${{ matrix.arch }}
+          name: linux-${{ matrix.configuration }}
          path: ${{ github.workspace }}/build/install/*.AppImage
  linux_zip:
    name: Build Linux distribution zip
    needs: build_linux
    runs-on: ubuntu-latest
    container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
-    strategy:
-      matrix:
-        arch: [x86_64, arm64]
    steps:
      - uses: actions/checkout@v1
        name: Checkout
        with:
          submodules: true
          fetch-depth: '0'  # value 0 to fetch all history and tags for all branches
-          ref: '${{ github.ref }}'
      - name: Download Release builds
        # Grab the release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: linux-Release-${{ matrix.arch }}
+          name: linux-Release
          path: builds
      - name: Download FastDebug builds
        # Grab the debug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: linux-FastDebug-${{ matrix.arch }}
+          name: linux-FastDebug
          path: builds
-      - name: Fix permissions
-        working-directory: ./builds
-        shell: bash
-        run: chmod 755 *.AppImage
      - name: Create Distribution package
        # Zip both builds together
        id: generate_package
        working-directory: ./builds
-        env:
-          ARCH: ${{ matrix.arch }}
        run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Linux
      - name: Upload result package
        # Stash the result to artifact filespace
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: ${{ steps.generate_package.outputs.package_name }}
          path: ${{ steps.generate_package.outputs.package_path }}
@@ -155,14 +179,13 @@ jobs:
        simd: [SSE2, AVX]
    needs: create_release
    name: Windows
-    runs-on: windows-2022
+    runs-on: windows-2019
    steps:
      - uses: actions/checkout@v1
        # Checkout repo
        name: Checkout
        with:
          submodules: true
-          ref: '${{ github.ref }}'
      # - name: Cache Qt
        # # Cache Qt
        # id: cache-qt-win
@@ -190,12 +213,7 @@ jobs:
          # arch: win64_msvc2017_64
          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
          # aqtversion: ==0.8
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
+
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
@@ -206,19 +224,11 @@ jobs:
          mkdir build
          cd build

-          if [ "$ARCHITECTURE" = "Win32" ]; then
-              cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
-                  -DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
-                  -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
-                  -DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
-                  -G "Visual Studio 16 2019" -T "v142" ..
-          else
-              cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
-                  -DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
-                  -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
-                  -DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
-                  -G "Visual Studio 16 2019" -T "v142" ..
-          fi
+          cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
+            -DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$SIMD" \
+            -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
+            -DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
+            -G "Visual Studio 16 2019" -T "v142" ..
      - name: Compile
        working-directory: ./build
        env:
@@ -235,7 +245,7 @@ jobs:
        shell: bash
        run: ./bin/$CONFIGURATION/unittests --gtest_shuffle
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: windows-${{ matrix.configuration }}-${{ matrix.arch }}-${{ matrix.simd }}
          path: ${{ github.workspace }}/build/install/*
@@ -257,15 +267,15 @@ jobs:
        with:
          submodules: true
          fetch-depth: '0'
-          ref: '${{ github.ref }}'
+
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: windows-Release-${{ matrix.arch }}-${{ matrix.simd }}
          path: builds

      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: windows-FastDebug-${{ matrix.arch }}-${{ matrix.simd }}
          path: builds
@@ -280,13 +290,13 @@ jobs:
        run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Windows

      - name: Upload result package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: ${{ steps.generate_package.outputs.package_name }}
          path: ${{ steps.generate_package.outputs.package_path }}

      - name: Upload debug package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: ${{ steps.generate_package.outputs.debug_name }}
          path: ${{ steps.generate_package.outputs.debug_path }}
@@ -305,7 +315,7 @@ jobs:
      matrix:
        configuration: [FastDebug, Release]
        compiler: [clang]
-        arch: [x86_64, arm64]
+        arch: [x86_64]
    name: Mac
    needs: create_release
    runs-on: macos-latest
@@ -324,25 +334,18 @@ jobs:
          # cached: ${{ steps.cache-qt-mac.outputs.cache-hit }}
          # setup-python: 'false'
          # aqtversion: ==1.1.3
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
          submodules: true
          fetch-depth: 0
-          ref: '${{ github.ref }}'
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
          COMPILER: ${{ matrix.compiler }}
          ARCHITECTURE: ${{ matrix.arch }}
          JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
-          ENABLE_QTFRED: OFF
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -351,39 +354,21 @@ jobs:
        working-directory: ./build
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          ARCH: ${{ matrix.arch }}
          XDG_RUNTIME_DIR: /root
        run: $GITHUB_WORKSPACE/ci/linux/run_tests.sh
-      - name: Sign builds
-        working-directory: ./build/bin
-        run: |
-          # make sure OpenAL framework is signed
-          find . -name OpenAL -type f | while read xx; do codesign --force -s - $xx; done
-          find . -name OpenAL.framework -type d | while read xx; do codesign --force -s - $xx; done
-          # make sure dylibs are signed
-          find . -name \*.dylib -type f | while read xx; do codesign --force -s - $xx; done
-          # sign binaries
-          find . -perm +111 -type f | grep MacOS | while read xx; do codesign --force -s - $xx; done
-          # sign apps
-          find . -name \*.app -maxdepth 1 | while read xx; do codesign --force -s - $xx; done
      - name: Package build result
-        working-directory: ./build/bin
-        # Use GNU tar here (part of runner image) to avoid weird corruption bug with bsdtar
-        # Ref: https://github.com/actions/runner-images/issues/2619
-        run: gtar -cvzf macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz *.app
+        working-directory: ./build
+        run: cd bin && tar -cvzf macos-build.tar *.app
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
-          name: mac-${{ matrix.configuration }}-${{ matrix.arch }}
-          path: ${{ github.workspace }}/build/bin/macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz
+          name: mac-${{ matrix.configuration }}
+          path: ${{ github.workspace }}/build/bin/macos-build.tar
  mac_zip:
    name: Build Mac distribution zip
    needs: build_mac
    runs-on: ubuntu-latest
    container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
-    strategy:
-      matrix:
-        arch: [x86_64, arm64]
    steps:
      - uses: actions/checkout@v2
        name: Checkout
@@ -392,28 +377,21 @@ jobs:
          fetch-depth: '0'
          ref: '${{ github.ref }}'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: mac-Release-${{ matrix.arch }}
+          name: mac-Release
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: mac-FastDebug-${{ matrix.arch }}
+          name: mac-FastDebug
          path: builds
-      - name: Unpack builds
-        working-directory: ./builds
-        run: |
-          tar -xvzf macos-build-Release-${{ matrix.arch }}.tgz
-          tar -xvzf macos-build-FastDebug-${{ matrix.arch }}.tgz
      - name: Create Distribution package
        id: generate_package
        working-directory: ./builds
-        env:
-          ARCH: ${{ matrix.arch }}
        run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Mac
      - name: Upload result package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: ${{ steps.generate_package.outputs.package_name }}
          path: ${{ steps.generate_package.outputs.package_path }}
@@ -0,0 +1,53 @@
+name: Publish Standalone docker image
+
+on:
+  push:
+    tags:
+    - 'nightly_*'
+    - 'release_*'
+
+jobs:
+  build_images:
+    if: github.repository == 'scp-fs2open/fs2open.github.com'
+    strategy:
+      matrix:
+        configuration: [FastDebug, Release]
+        include:
+        - configuration: FastDebug
+          tag_suffix: -debug
+        - configuration: Release
+          tag_suffix: ""
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout
+      with:
+        submodules: true
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Docker meta
+      id: docker_meta
+      uses: crazy-max/ghaction-docker-meta@v1
+      with:
+        images: ghcr.io/scp-fs2open/standalone_server
+        tag-latest: false
+
+    - name: Login to GitHub Docker Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.CR_PAT }}
+    - name: Build and push
+      id: docker_build
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./docker/standalone/Dockerfile
+        push: true
+        tags: ${{ steps.docker_meta.outputs.tags }}${{ matrix.tag_suffix }}
+        labels: ${{ steps.docker_meta.outputs.labels }}
+        build-args: |
+          build_type=${{ matrix.configuration }}
@@ -6,7 +6,7 @@ on:
      - 'test/*'

 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 5.12.9

 jobs:
  build_linux:
@@ -15,8 +15,23 @@ jobs:
        configuration: [FastDebug, Release]
    name: Linux
    runs-on: ubuntu-latest
-    container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
+    container: ghcr.io/scp-fs2open/linux_build:sha-8a6bbbe
    steps:
+      # - name: Cache Qt
+        # id: cache-qt-lin
+        # uses: actions/cache@v1
+        # with:
+          # path: ${{ github.workspace }}/../Qt
+          # key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
+      # - name: Install Qt
+        # uses: jurplel/install-qt-action@v2
+        # with:
+          # version: ${{ env.QT_VERSION }}
+          # dir: ${{ github.workspace }}/..
+          # cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
+          # setup-python: 'false'
+          # aqtversion: ==1.1.3
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
@@ -30,8 +45,7 @@ jobs:
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: gcc-9
-          ENABLE_QTFRED: OFF
+          COMPILER: gcc-5
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -51,7 +65,7 @@ jobs:
          CONFIGURATION: ${{ matrix.configuration }}
        run: $GITHUB_WORKSPACE/ci/linux/generate_appimage.sh $GITHUB_WORKSPACE/build/install
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: linux-${{ matrix.configuration }}
          path: ${{ github.workspace }}/build/install/*.AppImage
@@ -68,12 +82,12 @@ jobs:
          fetch-depth: '0'
          ref: '${{ github.ref }}'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
          name: linux-Release
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: linux-FastDebug
          path: builds
@@ -96,7 +110,7 @@ jobs:
        arch: [Win32, x64]
        simd: [SSE2]
    name: Windows
-    runs-on: windows-2022
+    runs-on: windows-2019
    steps:
      - uses: actions/checkout@v1
        name: Checkout
@@ -132,12 +146,7 @@ jobs:
          # arch: win64_msvc2017_64
          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
          # aqtversion: ==0.8
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
+
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
@@ -148,19 +157,11 @@ jobs:
          mkdir build
          cd build

-          if [ "$ARCHITECTURE" = "Win32" ]; then
-              cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
-                -DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
-                -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
-                -DFSO_INSTALL_DEBUG_FILES="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -A "$ARCHITECTURE" \
-                -G "Visual Studio 16 2019" -T "v142" ..
-          else
-              cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
-                -DFSO_USE_VOICEREC="ON" -DFORCED_SIMD_INSTRUCTIONS="$SIMD" \
-                -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
-                -DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
-                -G "Visual Studio 16 2019" -T "v142" ..
-          fi
+          cmake -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DFSO_USE_SPEECH="ON" \
+            -DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$SIMD" \
+            -DFSO_BUILD_QTFRED=OFF -DFSO_BUILD_TESTS=ON \
+            -DFSO_INSTALL_DEBUG_FILES="ON" -A "$ARCHITECTURE" \
+            -G "Visual Studio 16 2019" -T "v142" ..
      - name: Compile
        working-directory: ./build
        env:
@@ -177,7 +178,7 @@ jobs:
        shell: bash
        run: ./bin/$CONFIGURATION/unittests --gtest_shuffle
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: windows-${{ matrix.configuration }}-${{ matrix.arch }}-${{ matrix.simd }}
          path: ${{ github.workspace }}/build/install/*
@@ -198,12 +199,12 @@ jobs:
          fetch-depth: '0'
          ref: '${{ github.ref }}'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v1
        with:
          name: windows-Release-${{ matrix.arch }}-${{ matrix.simd }}
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
          name: windows-FastDebug-${{ matrix.arch }}-${{ matrix.simd }}
          path: builds
@@ -229,7 +230,7 @@ jobs:
      matrix:
        configuration: [FastDebug, Release]
        compiler: [clang]
-        arch: [x86_64, arm64]
+        arch: [x86_64]
    name: Mac
    runs-on: macos-latest
    steps:
@@ -248,17 +249,12 @@ jobs:
          # setup-python: 'false'
          # aqtversion: ==1.1.3
          # py7zrversion: '==0.19.*'
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
          submodules: true
          fetch-depth: 0
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
      - name: Set up test version
        shell: bash
        run: |
@@ -270,7 +266,6 @@ jobs:
          CONFIGURATION: ${{ matrix.configuration }}
          COMPILER: ${{ matrix.compiler }}
          ARCHITECTURE: ${{ matrix.arch }}
-          ENABLE_QTFRED: OFF
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -279,39 +274,21 @@ jobs:
        working-directory: ./build
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          ARCH: ${{ matrix.arch }}
          XDG_RUNTIME_DIR: /root
        run: $GITHUB_WORKSPACE/ci/linux/run_tests.sh
-      - name: Sign builds
-        working-directory: ./build/bin
-        run: |
-          # make sure OpenAL framework is signed
-          find . -name OpenAL -type f | while read xx; do codesign --force -s - $xx; done
-          find . -name OpenAL.framework -type d | while read xx; do codesign --force -s - $xx; done
-          # make sure dylibs are signed
-          find . -name \*.dylib -type f | while read xx; do codesign --force -s - $xx; done
-          # sign binaries
-          find . -perm +111 -type f | grep MacOS | while read xx; do codesign --force -s - $xx; done
-          # sign apps
-          find . -name \*.app -maxdepth 1 | while read xx; do codesign --force -s - $xx; done
      - name: Package build result
-        working-directory: ./build/bin
-        # Use GNU tar here (part of runner image) to avoid weird corruption bug with bsdtar
-        # Ref: https://github.com/actions/runner-images/issues/2619
-        run: gtar -cvzf macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz *.app
+        working-directory: ./build
+        run: cd bin && tar -cvzf macos-build.tar *.app
      - name: Upload build result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
-          name: mac-${{ matrix.configuration }}-${{ matrix.arch }}
-          path: ${{ github.workspace }}/build/bin/macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz
+          name: mac-${{ matrix.configuration }}
+          path: ${{ github.workspace }}/build/bin/macos-build.tar
  mac_zip:
    name: Build Mac distribution zip
    needs: build_mac
    runs-on: ubuntu-latest
    container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
-    strategy:
-      matrix:
-        arch: [x86_64, arm64]
    steps:
      - uses: actions/checkout@v2
        name: Checkout
@@ -320,24 +297,17 @@ jobs:
          fetch-depth: '0'
          ref: '${{ github.ref }}'
      - name: Download Release builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: mac-Release-${{ matrix.arch }}
+          name: mac-Release
          path: builds
      - name: Download FastDebug builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v2
        with:
-          name: mac-FastDebug-${{ matrix.arch }}
+          name: mac-FastDebug
          path: builds
-      - name: Unpack builds
-        working-directory: ./builds
-        run: |
-          tar -xvzf macos-build-Release-${{ matrix.arch }}.tgz
-          tar -xvzf macos-build-FastDebug-${{ matrix.arch }}.tgz
      - name: Create Distribution package
        working-directory: ./builds
-        env:
-          ARCH: ${{ matrix.arch }}
        run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Mac
      - name: Upload result package
        working-directory: ./builds
@@ -6,27 +6,42 @@ on:
      - master

 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 5.12.9

 jobs:
  build_linux:
    strategy:
      matrix:
        configuration: [Debug, Release]
-        compiler: [gcc-9, gcc-13, clang-16]
+        compiler: [gcc-5, gcc-10]
        cmake_options: [""]
        include:
          # Also include configurations that check if the code compiles without the graphics backends
          - configuration: Debug
-            compiler: gcc-13
+            compiler: gcc-10
            cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
          - configuration: Release
-            compiler: gcc-13
+            compiler: gcc-10
            cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
    name: Linux
    runs-on: ubuntu-latest
-    container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
+    container: ghcr.io/scp-fs2open/linux_build:sha-8a6bbbe
    steps:
+      # - name: Cache Qt
+        # id: cache-qt-lin
+        # uses: actions/cache@v1
+        # with:
+          # path: ${{ github.workspace }}/../Qt
+          # key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
+      # - name: Install Qt
+        # uses: jurplel/install-qt-action@v2
+        # with:
+          # version: ${{ env.QT_VERSION }}
+          # dir: ${{ github.workspace }}/..
+          # cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
+          # setup-python: 'false'
+          # aqtversion: ==1.1.3
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
@@ -35,22 +50,13 @@ jobs:
        uses: hendrikmuhs/ccache-action@v1
        with:
          key: ${{ runner.os }}-${{ matrix.configuration }}-${{ matrix.compiler }}
-      - name: Configure ccache
-        run: |
-          ccache --set-config=sloppiness=pch_defines,time_macros
-          ccache -p

      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
          COMPILER: ${{ matrix.compiler }}
          JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
-          CCACHE_PATH: /usr/local/bin/ccache
-          ENABLE_QTFRED: ON
-          Qt5_DIR: /qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt5
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
-      - name: Show CCache statistics
-        run: ccache --show-stats
@@ -3,33 +3,42 @@ name: Check a pull request
 on: [pull_request]

 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 5.12.9

 jobs:
  build_linux:
    strategy:
      matrix:
        configuration: [Debug, Release]
-        compiler: [gcc-9, gcc-13, clang-16]
+        compiler: [gcc-5, gcc-10, clang-9]
        cmake_options: [""]
        include:
          # Also include configurations that check if the code compiles without the graphics backends
          - configuration: Debug
-            compiler: gcc-13
+            compiler: gcc-10
            cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
          - configuration: Release
-            compiler: gcc-13
+            compiler: gcc-10
            cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
-          - configuration: Debug
-            compiler: gcc-13
-            cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=ON
-          - configuration: Release
-            compiler: gcc-13
-            cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=ON
    name: Linux
    runs-on: ubuntu-latest
-    container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
+    container: ghcr.io/scp-fs2open/linux_build:sha-8a6bbbe
    steps:
+      # - name: Cache Qt
+        # id: cache-qt-lin
+        # uses: actions/cache@v1
+        # with:
+          # path: ${{ github.workspace }}/../Qt
+          # key: ${{ runner.os }}-QtCache-${{ env.QT_VERSION }}
+      # - name: Install Qt
+        # uses: jurplel/install-qt-action@v2
+        # with:
+          # version: ${{ env.QT_VERSION }}
+          # dir: ${{ github.workspace }}/..
+          # cached: ${{ steps.cache-qt-lin.outputs.cache-hit }}
+          # setup-python: 'false'
+          # aqtversion: ==1.1.3
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
@@ -39,18 +48,12 @@ jobs:
        uses: hendrikmuhs/ccache-action@v1
        with:
          key: ${{ runner.os }}-${{ matrix.configuration }}-${{ matrix.compiler }}
-          save: false # Caches are created by a separate job and only restored for PRs
-          verbose: 1
-      - name: Configure ccache
-        run: ccache --set-config=sloppiness=pch_defines,time_macros
+
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
          COMPILER: ${{ matrix.compiler }}
          JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
-          CCACHE_PATH: /usr/local/bin/ccache
-          ENABLE_QTFRED: ON
-          Qt5_DIR: /qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt5
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -61,8 +64,6 @@ jobs:
          CONFIGURATION: ${{ matrix.configuration }}
          XDG_RUNTIME_DIR: /root
        run: $GITHUB_WORKSPACE/ci/linux/run_tests.sh
-      - name: Show CCache statistics
-        run: ccache --show-stats
      - name: Run Clang Tidy
        # Clang-tidy reuses the precompiled headers so this only makes sense for the clang compilers
        if: startsWith(matrix.compiler, 'clang-')
@@ -80,7 +81,7 @@ jobs:
        compiler: [MSVC]
        arch: [Win32, x64]
    name: Windows
-    runs-on: windows-2022
+    runs-on: windows-2019
    steps:
      - name: Prepare Environment
        run: choco install ninja
@@ -112,12 +113,7 @@ jobs:
          # arch: win64_msvc2017_64
          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
          # aqtversion: ==0.8
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
+
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
@@ -129,23 +125,12 @@ jobs:
          cd build

          if [ "$COMPILER" = "MinGW" ]; then
-              if [ "$ARCHITECTURE" = "Win32" ]; then
-                  cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-                      -DFSO_BUILD_FRED2="OFF" -DFSO_BUILD_WITH_VULKAN="OFF" -DCMAKE_BUILD_TYPE=$CONFIGURATION -G "Ninja" ..
-              else
-                  cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-                      -DFSO_BUILD_FRED2="OFF" -DCMAKE_BUILD_TYPE=$CONFIGURATION -G "Ninja" ..
-              fi
+              cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
+                  -DFSO_BUILD_FRED2="OFF" -DCMAKE_BUILD_TYPE=$CONFIGURATION -G "Ninja" ..
          else
-              if [ "$ARCHITECTURE" = "Win32" ]; then
-                  cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-                      -DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -DFSO_BUILD_WITH_VULKAN="OFF" -G "Visual Studio 16 2019" \
-                      -DFSO_BUILD_QTFRED=OFF -T "v142" -A "$ARCHITECTURE" ..
-              else
-                  cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-                      -DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 16 2019" \
-                      -DFSO_BUILD_QTFRED=OFF -T "v142" -A "$ARCHITECTURE" ..
-              fi
+              cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
+                  -DMSVC_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 16 2019" \
+                  -DFSO_BUILD_QTFRED=OFF -T "v142" -A "$ARCHITECTURE" ..
          fi
      - name: Compile
        working-directory: ./build
@@ -177,7 +162,7 @@ jobs:
      matrix:
        configuration: [Debug, Release]
        compiler: [clang]
-        arch: [x86_64, arm64]
+        arch: [x86_64]
        cmake_options: [""]
    name: Mac
    runs-on: macos-latest
@@ -197,6 +182,7 @@ jobs:
          # setup-python: 'false'
          # aqtversion: ==1.1.3
          # py7zrversion: '==0.19.*'
+
      - uses: actions/checkout@v1
        name: Checkout
        with:
@@ -205,21 +191,14 @@ jobs:
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
        with:
-          key: ${{ runner.os }}-${{ matrix.configuration }}-${{ matrix.compiler }}-${{ matrix.arch }}
-          save: false # Caches are created by a separate job and only restored for PRs
-      - name: Prepare Vulkan SDK
-        uses: humbletim/[email protected]
-        with:
-          vulkan-query-version: 1.4.304.1
-          vulkan-components: Vulkan-Headers, Vulkan-Loader
-          vulkan-use-cache: true
+          key: ${{ runner.os }}-${{ matrix.configuration }}-${{ matrix.compiler }}
+
      - name: Configure CMake
        env:
          CONFIGURATION: ${{ matrix.configuration }}
          COMPILER: ${{ matrix.compiler }}
          ARCHITECTURE: ${{ matrix.arch }}
          JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
-          ENABLE_QTFRED: OFF
        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
      - name: Compile
        working-directory: ./build
@@ -228,7 +207,6 @@ jobs:
        working-directory: ./build
        env:
          CONFIGURATION: ${{ matrix.configuration }}
-          ARCH: ${{ matrix.arch }}
          XDG_RUNTIME_DIR: /root
        run: $GITHUB_WORKSPACE/ci/linux/run_tests.sh
      - name: Run Clang Tidy
@@ -239,4 +217,4 @@ jobs:
        if: startsWith(matrix.compiler, 'clang-')
        uses: asarium/clang-tidy-action@v1
        with:
-          fixesFile: clang-fixes.yaml
+          fixesFile: clang-fixes.yaml
@@ -1,73 +0,0 @@
-name: Weekly Coverity Scan for Freespace Open
-# adapted from code by "albert-github" on the doxygen repository
-# many thanks for figuring this out first so it could be less painful for us!
-
-#This mode is for testing
-#on: [push, pull_request]
-
-# In production, push on a specific schedule
-on:
-  schedule:
-    - cron: "5 0 * * 5" # Run once per a week on Friday morning (midnight UTC, 4 AM EST), to avoid Coverity's submission limits
-
-env:
-  QT_VERSION: 5.12.12
-  coverity_email: [email protected]
-  coverity_token: ${{ secrets.COVERITY_TOKEN }}
-
-jobs:
-  build:
-    name: Build FSO With Coverity Wrapper
-    if: github.repository == 'scp-fs2open/fs2open.github.com'
-    runs-on: ${{ matrix.config.os }}
-    container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - { name: "GCC on ubuntu", os: ubuntu-latest, build_type: "Release" }
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-        with:
-          submodules: recursive # `true` to checkout submodules, `recursive` to recursively checkout submodules
-
-      # pipe results of wget to a log file because it's very verbose and rarely fails
-      - name: Install Coverity
-        run: |
-          wget -o wgetlog.txt -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=${{ env.coverity_token }}&project=scp-fs2open/fs2open.github.com" -O coverity_tool.tgz
-          mkdir cov-scan
-          tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
-
-      - name: Setup Environment
-        run: |
-          echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
-          echo "NPROC=$(getconf _NPROCESSORS_ONLN)" >> $GITHUB_ENV
-
-      - name: Configure CMake for FSO
-        env:
-          CONFIGURATION: Release
-          COMPILER: gcc-9
-          ENABLE_QTFRED: OFF
-        run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
-
-      - name: Build FSO with Coverity Wrapper
-        working-directory: ./build
-        env:
-          CONFIGURATION: Release
-        run: cov-build --dir cov-int ninja -k 20 all
-
-      - name: Compress Results
-        working-directory: ./build
-        run: tar zcf cov-scan.tgz cov-int
-
-      #Comment this out when testing to keep from running into upload limits
-      - name: Upload to Coverity
-        run: |
-          cd build
-          curl -X POST -d token=${{ env.coverity_token }} -d email=${{ env.coverity_email }} -d file_name="'cov-scan.tgz'" -d version=${{ github.ref }} -d description="Automatic GHA scan" 'https://scan.coverity.com/projects/870/builds/init' | tee response
-          upload_url=$(jq -r '.url' response)
-          build_id=$(jq -r '.build_id' response)
-          curl -X PUT --header 'Content-Type: application/json' --upload-file cov-scan.tgz $upload_url
-          curl -X PUT -d token=${{ env.coverity_token }} https://scan.coverity.com/projects/870/builds/$build_id/enqueue
@@ -250,7 +250,6 @@ documentation/doxygen/*
 projects/*
 /.vs
 CMakeSettings.json
-CMakePresets.json

 # Weird files created by Linux
 .fuse_hidden*
@@ -1,6 +1,7 @@
 [submodule "cmake/external/rpavlik-cmake-modules"]
 	path = cmake/external/rpavlik-cmake-modules
-	url = https://github.com/rpavlik/cmake-modules.git
+	url = https://github.com/asarium/cmake-modules.git
 [submodule "lib/libRocket"]
 	path = lib/libRocket
-	url = https://github.com/scp-fs2open/libRocket.git
+	url = https://github.com/asarium/libRocket.git
+
@@ -0,0 +1,175 @@
+language: bash
+sudo: required
+dist: xenial
+cache:
+  directories:
+    - $HOME/cmake-3.8
+    - $HOME/.ccache
+    - $HOME/curl_cache
+addons:
+  apt:
+    packages: &global_deps
+      - ninja-build
+      - libopenal-dev
+      - libreadline6-dev
+      - libpng12-dev
+      - libjpeg62-dev
+      - liblua5.1-0-dev
+      - libjansson-dev
+      - libsdl2-dev
+      - libfreetype6-dev
+      - qt57base
+  coverity_scan:
+    project:
+      name: "scp-fs2open/fs2open.github.com"
+    notification_email: [email protected]
+    build_command:   "ci/travis/script.sh"
+    # must match TRAVIS_BRANCH check below
+    branch_pattern: coverity_scan
+env:
+  global:
+    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+    #   via the "travis encrypt" command using the project repo's public key
+    #   also note that fork's don't get access to secure keys
+    #   you have to test using a branch in the main repo
+    - secure: "C3wF967ZeliwwP1vC12EMIBOaC568n26Z/cPnwzn317ve59DWH3YSfPZVgvt08GzmaXITGGsJvPB+qxfGoKvQzYE4O1B73q81RpUe5pB3IhF+ThQ91VfQZIRJR5xEGJaLINUlHTTZGX5jxlkVO9wAcauVj/s3b8sQ3dvUZauPvk="
+    # These declarations set INDIEGAMES_USER and INDIEGAMES_PASSWORD for uploading nightly builds to the indiegames server
+    - secure: "lUuRu8XIi8MKNf1ebOfyC4iVEpPyASojJIDWXRo2bNqEF4ILAljXdkVeXeN6H5yKCHD52cxCNTtyePIG/o3p3QEuGSVud9bDS3D7LaQicLETGGrsw3l07U49gF2OKHXGopg0MzBbZUU9QmhoFTAe8t6PV9NDuEayYCheqvTqjZg="
+    - secure: "E/DHLYcPK/hBUqxBYYlUqp5sjgvIqY5A0qRHyQ4bmjsB+WB/Xx71bGCSiF7hk6lTxar1ZI1i5RAXXh9AIvNVaYAIdEOlCP+q3gvwCYuc5naZEKmkxlUCf0oEL4O9Fye93A/3VkFHuBdC1TGPYYf69m4W5r4367wWO9dPRIdWpJA="
+    # These declarations set DATACORDER_USER and DATACORDER_PASSWORD
+    - secure: "dpBH/dDN3bmU/NFlh+2v9isNx9wX0ocoRy+W+kBXRH32sosUGp26REhMqgVRpBNP5oxPBU8ic5bEogxAYWCB+0xUygBbkxAwyMPgoA34s0OXdTCY/ofw14ni8qqV2Ffy7fQJbP/jkMURyiMHx3kBTxNv3YjxKJqLnOuOMlQLpT8="
+    - secure: "tLMRBD1Ufp5iKNwlqPDVbbuczgusaXNoBJyAnPATpJq2YwlkW4j3PqP9rW5vd85+52xam2EOP20w9PoBR5J6FLdiXRu4Lf7yCEhSHFAgowVqQj8QcJpPlyXr90bM4emFGrGqpdxVwxyQ5AFhKwLuEZKsI14GYLN+UMEwpNCMing="
+deploy:
+  - provider: releases
+    api_key:
+      secure: "q619+eQTe7lv8UVphK4OIzU8Jw84KBbVkuprN2sWIubRcV3IbZr2+WahJoUMt+nyhiy3YjDYtstO2ZgkxupwnZgwGUBVIiD1c4SPuyy+HTjNMOtiVsEUHT2hf+xPAemWpTlK5HcwhMmHAOh6rt6dEj57QOg0gcmGiwD/tCbEriA="
+    skip_cleanup: true
+    file_glob: true
+    file: "/tmp/builds/*"
+    on:
+      condition: '"$RELEASE_BUILD" == true'
+      tags: true
+
+  - provider: script
+    script: bash ci/travis/ftp_deploy.sh
+    on:
+      condition: '"$NIGHTLY_BUILD" == true'
+      tags: true
+
+  - provider: script
+    skip_cleanup: true
+    script: bash ci/travis/ftp_deploy.sh
+    on:
+      condition: $TEST_BUILD = true
+      all_branches: true
+
+matrix:
+  include:
+    # note that gcc Debug MUST be 1st for Coverity
+    - os: linux
+      env: CONFIGURATION="Debug" CC=gcc-5 CXX=g++-5
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+          packages:
+            - *global_deps
+            - g++-5
+    - os: linux
+      env: CONFIGURATION="Debug" CC=gcc-9 CXX=g++-9
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+          packages:
+            - g++-9
+            - *global_deps
+    - os: linux
+      env: CONFIGURATION="Debug" CC=clang-9 CXX=clang++-9 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+          packages:
+            - *global_deps
+            - g++-9
+      script:
+        - ./ci/travis/script.sh
+        - ./ci/travis/clang_tidy.sh
+    - os: osx
+      env: CONFIGURATION="Debug"
+
+    - os: windows
+      env: CONFIGURATION="Debug" CMAKE_TOOLSET=v141 CMAKE_GENERATOR="Visual Studio 15 2017"
+    - os: windows
+      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
+
+    - os: linux
+      env: CONFIGURATION="Release" CC=gcc-5 CXX=g++-5
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+          packages:
+            - *global_deps
+            - g++-5
+    - os: linux
+      env: CONFIGURATION="Release" CC=gcc-9 CXX=g++-9
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+          packages:
+            - g++-9
+            - *global_deps
+    - os: linux
+      env: CONFIGURATION="Release" CC=clang-9 CXX=clang++-9 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+          packages:
+            - *global_deps
+            - g++-9
+      script:
+        - ./ci/travis/script.sh
+        - ./ci/travis/clang_tidy.sh
+    - os: osx
+      env: CONFIGURATION="Release"
+
+    - os: windows
+      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141 CMAKE_GENERATOR="Visual Studio 15 2017"
+    - os: windows
+      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
+  # There is a GCC compiler bug with MinGW that causes compilation failures on Windows at the moment
+  allow_failures:
+    - os: windows
+      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
+    - os: windows
+      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
+  fast_finish: true
+
+before_install:
+  # ugly hack; if running a coverity scan abort all except the 1st build
+  # see note re gcc compiler above needing to be 1st
+  # also note that branch_pattern & the TRAVIS_BRANCH check must match
+  # unfortunately COVERITY_SCAN_BRANCH isn't defined until later in the
+  # build process
+  - if ([[ "${TRAVIS_JOB_NUMBER##*.}" != "1" ]] && [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]); then false ; fi
+  - source "./ci/travis/check_release.sh"
+  - "./ci/travis/before_install.sh"
+install:
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH="/c/Program Files/CMake/bin":$PATH; fi
+  - "./ci/travis/install.sh"
+  - export PATH=$HOME/cmake-3.6/bin:$PATH
+before_script:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then QT_ENV_SCRIPT=$(find /opt -name 'qt*-env.sh'); source $QT_ENV_SCRIPT; fi
+  - "./ci/travis/before_script.sh"
+script:
+  - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
@@ -1,5 +1,5 @@

-CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.4)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

 # Make sure the source and binary directory are not the sample
@@ -47,6 +47,25 @@ endif()

 PROJECT(FS2_Open LANGUAGES ${FSO_LANGUAGES})

+find_program(CCACHE_PROGRAM ccache)
+# Currently only GCC support ccache properly without generating additional warnings
+# Enable ccache on Mac even for clang
+if(CCACHE_PROGRAM AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR APPLE))
+	if(NOT CMAKE_C_COMPILER_LAUNCHER)
+		message(STATUS "Using ccache for C compilation: ${CCACHE_PROGRAM}")
+		SET(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
+	endif()
+	if(NOT CMAKE_CXX_COMPILER_LAUNCHER)
+		message(STATUS "Using ccache for C++ compilation: ${CCACHE_PROGRAM}")
+		SET(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
+	endif()
+endif()
+
+IF(CMAKE_CROSSCOMPILING)
+	SET(IMPORT_EXE_DIR "IMPORT_EXE_DIR-NOTFOUND" CACHE FILEPATH "Required for a cross compiling build, point to binary directory of a cmake build for the real OS")
+	INCLUDE(${IMPORT_EXE_DIR}/ImportExecutables.cmake)
+ENDIF(CMAKE_CROSSCOMPILING)
+
 # Check if the external modules exists
 IF(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules/launcher-templates")
 	message(FATAL_ERROR "External submodules could not be found. Please make sure you have updated your submodules.")
@@ -117,27 +136,9 @@ option(FSO_RELEASE_LOGGING "Enable logging output for release builds" OFF)

 OPTION(FSO_BUILD_WITH_FFMPEG "Enable the usage of FFmpeg for sound and custscenes" ON)

-OPTION(FSO_BUILD_WITH_DISCORD "Build with Discord support" ON)
-
 OPTION(FSO_BUILD_WITH_OPENGL "Enable compilation of the OpenGL renderer" ON)
-OPTION(FSO_BUILD_WITH_OPENGL_DEBUG "Enables debug option for OpenGL" OFF)

-OPTION(FSO_BUILD_WITH_VULKAN "Enable compilation of the Vulkan renderer" OFF)
-
-IF(NOT APPLE)
-	SET(OPENXR_BUILD_DEFAULT ON)
-ELSE()
-	SET(OPENXR_BUILD_DEFAULT OFF)
-ENDIF()
-OPTION(FSO_BUILD_WITH_OPENXR "Build with OpenXR support" ${OPENXR_BUILD_DEFAULT})
-IF(FSO_BUILD_WITH_OPENXR AND APPLE)
-	MESSAGE(WARNING "FSO_BUILD_WITH_OPENXR is ON. Not supported on macOS - setting to OFF.")
-	SET(FSO_BUILD_WITH_OPENXR OFF CACHE BOOL "" FORCE)
-ENDIF()
-
-OPTION(FSO_BUILD_WITH_OPENXR_DEBUG "Enables debug option for OpenXR" OFF)
-
-OPTION(FSO_USE_LTO "Build using LTO (only for release builds)" ON)
+OPTION(FSO_BUILD_WITH_VULKAN "Enable compilation of the Vulkan renderer" ON)

 MARK_AS_ADVANCED(FORCE FSO_CMAKE_DEBUG)
 MARK_AS_ADVANCED(FORCE FSO_BUILD_INCLUDED_LIBS)
@@ -149,12 +150,8 @@ mark_as_advanced(FORCE FSO_INSTALL_DEBUG_FILES)
 mark_as_advanced(FORCE ENABLE_COTIRE)
 mark_as_advanced(FORCE FSO_RELEASE_LOGGING)
 mark_as_advanced(FORCE FSO_BUILD_WITH_FFMPEG)
-mark_as_advanced(FORCE FSO_BUILD_WITH_DISCORD)
 mark_as_advanced(FORCE FSO_BUILD_WITH_OPENGL)
-mark_as_advanced(FORCE FSO_BUILD_WITH_OPENGL_DEBUG)
 mark_as_advanced(FORCE FSO_BUILD_WITH_VULKAN)
-mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR)
-mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR_DEBUG)

 # Include cotire file from https://github.com/sakra/cotire/
 include(cotire)
@@ -176,14 +173,6 @@ endif()

 include(clang-tidy)

-include(CheckIPOSupported)
-check_ipo_supported(RESULT LTO_AVAILABLE)
-if (CMAKE_BUILD_TYPE STREQUAL "Release" AND FSO_USE_LTO AND LTO_AVAILABLE)
-	set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
-	message("Enabled LTO")
-	set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif (CMAKE_BUILD_TYPE STREQUAL "Release" AND FSO_USE_LTO AND LTO_AVAILABLE)
-
 # This includes source code for some tools, either used in the build or also for something else
 ADD_SUBDIRECTORY(tools)

@@ -241,7 +230,5 @@ message(STATUS "Building qtFRED: ${FSO_BUILD_QTFRED}")
 message(STATUS "Fatal warnings: ${FSO_FATAL_WARNINGS}")
 message(STATUS "Release logging: ${FSO_RELEASE_LOGGING}")
 message(STATUS "With FFmpeg: ${FSO_BUILD_WITH_FFMPEG}")
-message(STATUS "With Discord: ${FSO_BUILD_WITH_DISCORD}")
 message(STATUS "With OpenGL: ${FSO_BUILD_WITH_OPENGL}")
 message(STATUS "With Vulkan: ${FSO_BUILD_WITH_VULKAN}")
-message(STATUS "With OpenXR: ${FSO_BUILD_WITH_OPENXR}")
@@ -3,185 +3,6 @@ All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

-## [23.2.0] - 2023-06-16
-### Changes
-
-<details><summary> <b>Big Feature: MSAA</b> </summary>
-
-> The return of a long forgotten feature, with optimizations and improvements
-> Noticeable reduction to artifacts caused by subpixel geometry and glinting.
-</details>
-
-<details><summary> <b>Big Feature: SCPUI</b> </summary>
-
-> A modernized approach to defining menus in FS
-> Tired of having your Menus in FSO be at a resolution of potato? Use SCPUI to have them rendered from Fake-HTML to the actual screensize as opposed to a prebuilt graphics!
-> Tired of being limited to whatever people in the SCP hardcoded in for buttons? Use SCPUI to define buttons and all other manner of shenanigans as Lua-code just as you like.
-> Tired of needing to replace a bajillion interface graphics to reskin FSO? Use SCPUI, and especially Mjn's existing collection of Lua, CSS, Fake-HTML and images, and you only need to replace about 250 graphics.
-</details>
-
-<details><summary> <b>Big Feature: Localized Volumetric Nebulae</b> </summary>
-
-> Allows specifying a POF as the "hull" of a nebula, which will be rendered using ray marching
-> Further details can be found on the [GitHub Pull Request](https://github.com/scp-fs2open/fs2open.github.com/pull/5231)
-> Note: As this is a new feature, many improvements and optimizations remain to be made
-> Adapted from Andrew Schneider's 2015 SIGGRAPH talk "The real-time volumetric cloudscapes of Horizon: Zero Dawn"
-</details>
-
-<details><summary>Game: </summary>
-
- Per bank autoaim
-</details>
-
-<details><summary>Animation: </summary>
-
- Fix CTD on bad legacy animation data
- Add proper time wrapping for Animations
- Actually handle a mssing `Fade_anim` properly
-</details>
-
-<details><summary>Controls: </summary>
-
- Organize and map additional keys to librocket
- Catch when SDL fails to open a joystick that is enumerated by the OS
-</details>
-
-<details><summary>FRED: </summary> 
-
- Add SpaceMouse support
- Add pre-parse enums support
- Add music player to FRED
- Enhanced SEXP comments
- FRED Dialog for Volumetrics
- QoL improvements to Object Editor
- Add FRED support for the "required weapon" feature
- SEXP Tree search and filter
-</details>
-
-<details><summary>QtFRED: </summary>
-
- Campaign Editor
- Add SpaceMouse support
- Make 'player starts in chase view' a toggle
-</details>
-
-<details><summary>Graphics: </summary>
-
- "The other great shader flag removal effort"
- Enhance handling of motion debris
- Expose texture filtering as a built-in option
- Improved particle culling and performance
- Optimized trail renderer
- Beam Particles
- Multiple lighting profiles
- Use volume particles for poofs
- Optimize for simple trails
- Kink shamed the laser bitmaps
-</details>
-
-<details><summary>HUD: </summary>
-
- Flag to apply HUD shudder to chase view
- Add missing HUD gauges
- Explicitly do not split lines when making the message log
-</details>
-
-<details><summary>Localization: </summary>
-
- Add some XSTR entries
-</details>
-
-<details><summary>Modding: </summary>
-
- Mapify built-in strings
- Allow `gameplay_profiles.tbl` to be an alias of `ai_profiles.tbl`
- Modular rank table
- Toggle auto-assigning personas
- Add some parameters for corkscrew starting angle
- Add clip planes to `game_settings.tbl`
- Add `+Use ship` as a Template
- Modular messages table
- Add arbitrary curves support
- Traitor overrides
- Add support for loose lz4 compressed files
- Add per-species warp effects
-</details>
-
-<details><summary>Models: </summary>
-
- Fix submodel sanity check
- Fix techroom modelnum references
- Adjust movement sanity checks to account for more situations
- Modular POF Features 2
- Add fov values to .pof models
- Add a Translation Moveable
- Remove model octants
- Fix glowpoints on animated submodels
- Update type_flags when dock name changes
- Add additional checks for Animation List handling of nonexistent polymodel instances
- Virtual POFs: Modify Subsystems
- Validate chunk size to avoid alignment crash and add align skip flag
-</details>
-
-<details><summary>Multiplayer: </summary>
-
- Generic Lua Multiplayer RPC
-</details>
-
-<details><summary>Performance: </summary>
-
- Increase sound update rate
- Add `line of sight` as an optional AI override
-</details>
-
-<details><summary>SEXPs: </summary>
-
- `turret-fired-since`, returns `true` if the specified turret has fired in the last `N` milliseconds
- `is-ship-emp-active`, returns `true` if the specified ship or list of ships is currently under an EMP effect
- `turret-has-primary` and `turret-has-secondary`, returns `true` if the specified turret contains the specified weapon
- `has-armor-type`, returns `true` if the specified ship or subsystem has the specified armor type
- `OPF_ANY_HUD_GAUGE` and `OPF_EVENT_NAME`, new Lua SEXP parameters
- Enhance Dynamic SEXPs with parent parameters
- Add "afterburn hard" AI goal flag
-</details>
-
-<details><summary>Scripting: </summary>
-
- Add option to deprecate hooks
- Get audiostream duration in float seconds
- Lua method to check if the game has focus
- `On warp complete` hook
- Allow Lua to set the Discord presence to custom strings
- Add virtvars for goal satisfaction and score
- Allow scripts to read and add LuaEnums
- Funcs and virtvars for SCPUI pause screen
- Expose pausing weapon sounds
- Make collision_group_id accessible to parse objects
- Pass shortcut key character to Lua as a hook variable
- Lua method to free all loaded models
- `On Asteroid Created` hook
- SCPUI methods required for handling closeup briefing icons
- Expose some Nebula settings to Lua
- SCPUI mission log
- SCPUI APIsfor the Game Help UI, medals access, and control config
- Force expand wings instead of toggle for SCPUI
- Add misc. validity checks
- Convert hotkey types to enum
- Finalize SCPUI API
- Blocking `On Frame` executor 
- SCPUI Hud Config API
- Configurable restriction for ships that accept Lua player orders
- Add `ship::isPlayer()`
- Lua access to default countermeasures class
- Flag to check if a ship or weapon class is player allowed
- Add hooks for comm menu opening/closing
-</details>
-
-<details><summary>Technical: </summary> 
-
- Improve CFLAGS handling
-</details>
-
 ## [22.2.0] - 2022-08-06

 ```
@@ -1,5 +1,7 @@
 FreeSpace2 *S*ource *C*ode *P*roject
 ==
+[![Travis-CI Build Status](https://travis-ci.org/scp-fs2open/fs2open.github.com.svg?branch=master)](https://travis-ci.org/scp-fs2open/fs2open.github.com)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/scp-fs2open/fs2open.github.com?branch=master&svg=true)](https://ci.appveyor.com/project/SirKnightly/fs2open-github-com/branch/master)
 [![Coverity](https://img.shields.io/coverity/scan/870.svg)](https://scan.coverity.com/projects/870)

 Building
@@ -0,0 +1,62 @@
+version: 1.0.0.{build}
+image: Visual Studio 2015
+configuration:
+  - Debug
+  - Release
+clone_depth: 10
+environment:
+  matrix:
+    - BuildID: 0
+      CMAKE_GENERATOR: Visual Studio 14 2015
+      PlatformToolset: v140
+      QT_DIR: C:\Qt\5.9\msvc2015
+    - BuildID: 1
+      CMAKE_GENERATOR: Visual Studio 14 2015 Win64
+      PlatformToolset: v140
+      QT_DIR: C:\Qt\5.9\msvc2015_64
+before_build:
+  - git submodule update --init --recursive
+build_script:
+  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/build.ps1
+test_script:
+  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/test.ps1
+
+deploy:
+    - provider: GitHub
+      auth_token:
+          secure: h55Scpy+3vmo1Yb7WlSIGA4d9DRnsbzUYc2LYsQdByQHZHbqrqjBpicH0D2FFLEO
+      on:
+          ReleaseBuild: true        # deploy on release push only
+
+    - provider: FTP
+      protocol: sftp
+      host: scp.indiegames.us
+      username:
+        secure: SFivQZfatqWHXK1ijYK3GQ==
+      password:
+        secure: q6Zk/412o1ri+NEya1dl1Q==
+      folder: public_html/builds/nightly/$(VersionName)
+      on:
+          NightlyBuild: true        # deploy on nightly push only
+
+    - provider: FTP
+      protocol: sftp
+      host: porphyrion.feralhosting.com
+      username:
+        secure: 36+bVD8eJgI0BVbi7TZ4zQ==
+      password:
+        secure: CrzmDVca8AGG08iWPA1gOD4Ge06+wJ3rcBagBGclwYQ=
+      folder: www/datacorder.porphyrion.feralhosting.com/public_html/builds/nightly/$(VersionName)
+      on:
+          NightlyBuild: true        # deploy on nightly push only
+
+    - provider: FTP
+      protocol: sftp
+      host: porphyrion.feralhosting.com
+      username:
+        secure: 36+bVD8eJgI0BVbi7TZ4zQ==
+      password:
+        secure: CrzmDVca8AGG08iWPA1gOD4Ge06+wJ3rcBagBGclwYQ=
+      folder: www/datacorder.porphyrion.feralhosting.com/public_html/builds/test/$(VersionName)
+      on:
+          TestBuild: true        # deploy on test build push only
@@ -0,0 +1,164 @@
+
+class BuildConfig {
+	[string]$Generator
+	[string]$PackageType
+	[string]$Toolset
+	[string]$SimdType
+	[string]$QtDir
+	[Bool]$SourcePackage
+}
+
+$NightlyConfigurations = @(
+#	[BuildConfig]@{
+#		Generator="Visual Studio 14 2015 Win64";
+#		PackageType="Win64";
+#		Toolset="v140";
+#		SimdType="SSE2";
+#		QtDir="C:\Qt\5.9\msvc2015_64";
+#		SourcePackage=$false;
+#	},
+#	[BuildConfig]@{
+#		Generator="Visual Studio 14 2015";
+#		PackageType="Win32";
+#		Toolset="v140";
+#		SimdType="SSE2";
+#		QtDir="C:\Qt\5.9\msvc2015";
+#		SourcePackage=$false;
+#	}
+)
+$ReleaseConfigurations = @(
+#	[BuildConfig]@{
+#		Generator="Visual Studio 14 2015";
+#		PackageType="Win32";
+#		Toolset="v140";
+#		SimdType="SSE2";
+#		QtDir="C:\Qt\5.9\msvc2015";
+#		SourcePackage=$true;
+#	}
+#	[BuildConfig]@{
+#		Generator="Visual Studio 14 2015";
+#		PackageType="Win32-AVX";
+#		Toolset="v140";
+#		SimdType="AVX";
+#		QtDir="C:\Qt\5.9\msvc2015";
+#		SourcePackage=$false;
+#	}
+#	[BuildConfig]@{
+#		Generator="Visual Studio 14 2015 Win64";
+#		PackageType="Win64";
+#		Toolset="v140";
+#		SimdType="SSE2";
+#		QtDir="C:\Qt\5.9\msvc2015_64";
+#		SourcePackage=$false;
+#	}
+#	[BuildConfig]@{
+#		Generator="Visual Studio 14 2015 Win64";
+#		PackageType="Win64-AVX";
+#		Toolset="v140";
+#		SimdType="AVX";
+#		QtDir="C:\Qt\5.9\msvc2015_64";
+#		SourcePackage=$false;
+#	}
+)
+
+$BuildConfigurations = $null
+
+# Default values
+$ReleaseBuild = $false
+$NightlyBuild = $false
+$TestBuild = $false
+
+# Set to true to test either the release or the nightly part of this script
+$ReleaseTest = $false
+$NightlyTest = $false
+$TestBuildTest = $false
+
+if ($ReleaseTest -Or ([System.Convert]::ToBoolean($env:APPVEYOR_REPO_TAG) -And ("$env:APPVEYOR_REPO_TAG_NAME" -match "^release_(.*)"))) {
+    # Tag matches
+    $ReleaseBuild = $true
+    $PackageName = "fs2_open_$($matches[1])"
+	$BuildConfigurations = $ReleaseConfigurations
+}
+
+if ($NightlyTest -Or ([System.Convert]::ToBoolean($env:APPVEYOR_REPO_TAG) -And ("$env:APPVEYOR_REPO_TAG_NAME" -match "^nightly_(.*)"))) {
+    # Tag matches
+    $NightlyBuild = $true
+    $PackageName = "nightly_$($matches[1])"
+	Set-AppveyorBuildVariable 'VersionName' "$($matches[1])"
+	$BuildConfigurations = $NightlyConfigurations
+}
+
+if ($TestBuildTest -Or ([System.Convert]::ToInt32($env:APPVEYOR_PULL_REQUEST_NUMBER) -le 0 -And ("$env:APPVEYOR_REPO_BRANCH" -match "^test\/(.*)"))) {
+    # Tag matches
+    $TestBuild = $true
+    $PackageName = "test_$($matches[1])"
+	Set-AppveyorBuildVariable 'VersionName' "$($matches[1])"
+	$BuildConfigurations = $NightlyConfigurations
+
+    # Override the revision string so that the builds are named correctly
+	[System.IO.File]::WriteAllLines("$env:APPVEYOR_BUILD_FOLDER/version_override.cmake", "set(FSO_VERSION_REVISION_STR $env:VersionName)")
+}
+
+# Multiply by 2 so that we can add 0 or 1 for debug or release Configs
+$buildID = [convert]::ToInt32($env:BuildID) * 2
+if ($Env:Configuration -eq "Release") {
+    $buildID = $buildID + 1
+}
+
+$DeployBuild = $false
+if ($ReleaseBuild -Or $NightlyBuild -Or $TestBuild) {
+    $DeployBuild = $true
+}
+
+Set-AppveyorBuildVariable 'ReleaseBuild' "$ReleaseBuild"
+Set-AppveyorBuildVariable 'NightlyBuild' "$NightlyBuild"
+Set-AppveyorBuildVariable 'TestBuild' "$TestBuild"
+
+New-Item build -type directory
+Set-Location -Path build
+
+if ($DeployBuild) {
+	# Release build
+	if ($buildID -ge $BuildConfigurations.Length) {
+		# Not needed
+        exit 0
+	}
+
+	$buildConfig = $BuildConfigurations[$buildID]
+
+	if ($buildConfig.SourcePackage -eq $True) {
+		7z a -xr'!.git' "$($PackageName)-source-Win.zip" "$env:APPVEYOR_BUILD_FOLDER"
+		Push-AppveyorArtifact "$($PackageName)-source-Win.zip"
+	}
+	
+	cmake -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/../install" -DFSO_USE_SPEECH="ON" `
+		-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$($buildConfig.SimdType)" `
+		-DQT5_INSTALL_ROOT="$($buildConfig.QtDir)" -DFSO_BUILD_QTFRED=OFF `
+		-DFSO_INSTALL_DEBUG_FILES="ON" `
+		-G "$($buildConfig.Generator)" -T "$($buildConfig.Toolset)" ..
+
+	$Configs = @("Release", "FastDebug")
+	foreach ($config in $Configs) {
+		cmake --build . --config "$config" --target INSTALL -- /verbosity:minimal
+		if (! ($?)) {
+			Add-AppveyorMessage "A release build failed!"
+			exit 1
+    	}
+	}
+
+    7z a -xr'!*.pdb' "$($PackageName)-builds-$($buildConfig.PackageType).zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
+    Push-AppveyorArtifact "$($PackageName)-builds-$($buildConfig.PackageType).zip"
+
+	7z a "$($PackageName)-debug-$($buildConfig.PackageType).7z" "$env:APPVEYOR_BUILD_FOLDER/../install/*.pdb"
+	Push-AppveyorArtifact "$($PackageName)-debug-$($buildConfig.PackageType).7z"
+} else {
+	cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="ON" -DFSO_BUILD_TESTS="ON" -DMSVC_SIMD_INSTRUCTIONS=SSE2 `
+	-DFSO_BUILD_QTFRED=OFF -DQT5_INSTALL_ROOT="$env:QT_DIR" -DFSO_BUILD_FRED2="ON" `
+	-G "$Env:CMAKE_GENERATOR" -T "$Env:PlatformToolset" ..
+
+    cmake --build . --config "$Env:CONFIGURATION" -- /verbosity:minimal
+
+    if (! ($?)) {
+        exit 1
+    }
+}
@@ -0,0 +1,13 @@
+
+if ([System.Convert]::ToBoolean($env:ReleaseBuild) -Or [System.Convert]::ToBoolean($env:NightlyBuild) -Or [System.Convert]::ToBoolean($env:TestBuild)) {
+    # Skip tests for deployment
+    exit 0
+} else {    
+    write "Running unit tests..."
+    # Run unit tests
+    &"$pwd\bin\$Env:CONFIGURATION\unittests.exe" --gtest_shuffle 2>&1
+
+    if (! ($?)) {
+        exit 1
+    }
+}
@@ -5,8 +5,6 @@ set -e
 SCRIPT=$(readlink -f "$0")
 HERE=$(dirname "$SCRIPT")

-git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
 COMMIT_RANGE=$1..$2

 if ! git rev-list $COMMIT_RANGE 2>&1 >/dev/null; then
@@ -18,13 +16,8 @@ fi
 # branch
 BASE_COMMIT=$(git merge-base $1 $2)

-# Note: Manually passing in the Vulkan flags that are normally provided by cmake (but are not so, here), to ensure
-# that the source files are checked with the actual configuration used.
 echo "Running clang-tidy on changed files"
 git diff -U0 --no-color "$BASE_COMMIT..$2" | \
    $HERE/clang-tidy-diff.py -path "$(pwd)/build" -p1 \
-    -extra-arg="-DWITH_VULKAN" \
-    -extra-arg="-DVULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1" \
-    -extra-arg="-DVK_NO_PROTOTYPES" \
    -regex '(code(?!((\/graphics\/shaders\/compiled)|(\/globalincs\/windebug)))|freespace2|qtfred|test|build|tools)\/.*\.(cpp|h)' \
-    -clang-tidy-binary /usr/bin/clang-tidy-16 -j$(nproc) -export-fixes "$(pwd)/clang-fixes.yaml"
+    -clang-tidy-binary /usr/bin/clang-tidy-9 -j$(nproc) -export-fixes "$(pwd)/clang-fixes.yaml"
@@ -1,38 +1,34 @@
 #!/usr/bin/env bash

-if [ "$COMPILER" = "gcc-9" ]; then
-    export CC=gcc-9
-    export CXX=g++-9
+if [ "$COMPILER" = "gcc-5" ]; then
+    export CC=gcc-5
+    export CXX=g++-5
 fi
-if [ "$COMPILER" = "gcc-13" ]; then
-    export CC=gcc-13
-    export CXX=g++-13
+if [ "$COMPILER" = "gcc-10" ]; then
+    export CC=gcc-10
+    export CXX=g++-10
 fi
-if [ "$COMPILER" = "clang-16" ]; then
-    export CC=clang-16
-    export CXX=clang++-16
+if [ "$COMPILER" = "clang-9" ]; then
+    # Work around bug in clang that uses the wrong installation directory: https://bugs.llvm.org/show_bug.cgi?id=47460
+    export CC=$(readlink -f $(which clang-9))
+    export CXX=$(readlink -f $(which clang++-9))
 fi

 LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH
 if [ "$RUNNER_OS" = "macOS" ]; then
    CXXFLAGS="-mtune=generic -pipe -Wno-unknown-pragmas"
    CFLAGS="-mtune=generic -pipe -Wno-unknown-pragmas"
-    # TODO: Vulkan support is disabled on MacOS due to issues with the test suite not linking correctly
-    PLATFORM_CMAKE_OPTIONS="-DFSO_BUILD_WITH_VULKAN=OFF"
+    PLATFORM_CMAKE_OPTIONS=""
    export CMAKE_OSX_ARCHITECTURES="$ARCHITECTURE"
 else
-    PLATFORM_CMAKE_OPTIONS="-DFSO_BUILD_APPIMAGE=ON -DFORCED_SIMD_INSTRUCTIONS=SSE2 -DUSE_STATIC_LIBCXX=ON"
+    CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
+    CFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
+    PLATFORM_CMAKE_OPTIONS="-DFSO_BUILD_APPIMAGE=ON"
 fi

 CMAKE_OPTIONS="$JOB_CMAKE_OPTIONS"
 if [[ "$COMPILER" =~ ^clang.*$ ]]; then
    CMAKE_OPTIONS="$CMAKE_OPTIONS -DCLANG_USE_LIBCXX=ON"
-    # force clang to silently allow -static-libstdc++ flag
-fi
-
-if [ ! "$CCACHE_PATH" = "" ]; then
-    echo "Using ccache at $CCACHE_PATH"
-    CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_C_COMPILER_LAUNCHER=$CCACHE_PATH -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE_PATH"
 fi

 mkdir build
@@ -45,11 +41,7 @@ export LD_LIBRARY_PATH
 if [ "$RUNNER_OS" = "macOS" ]; then
    brew install ninja
 fi
-
-# CMAKE_JOB_POOLS and CMAKE_JOB_POOL_LINK ensure that when using ninja, link operations are done sequentially
-# we have some build rules that do not play nice with parallel invocation and that fixes these issues
-
 cmake -G Ninja -DFSO_FATAL_WARNINGS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON $CMAKE_OPTIONS $PLATFORM_CMAKE_OPTIONS \
    -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DCMAKE_BUILD_TYPE=$CONFIGURATION \
-    -DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=${ENABLE_QTFRED:-OFF} \
-    -DSHADERS_ENABLE_COMPILATION=ON -DCMAKE_JOB_POOLS=link=1 -DCMAKE_JOB_POOL_LINK=link ..
+    -DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=OFF \
+    -DSHADERS_ENABLE_COMPILATION=ON ..
@@ -8,29 +8,29 @@ OS="$1"
 source $HERE/dist_functions.sh

 if [ "$OS" = "Linux" ]; then
-    tar -cvzf "$(get_package_name)-builds-Linux-$ARCH.tar.gz" *
+    tar -cvzf "$(get_package_name)-builds-Linux.tar.gz" *

-    echo "package_path=$(pwd)/$(get_package_name)-builds-Linux-$ARCH.tar.gz" >> $GITHUB_OUTPUT
-    echo "package_name=$(get_package_name)-builds-Linux-$ARCH.tar.gz" >> $GITHUB_OUTPUT
-    echo "package_mime=$(file -b --mime-type "$(pwd)/$(get_package_name)-builds-Linux-$ARCH.tar.gz")" >> $GITHUB_OUTPUT
+    echo "::set-output name=package_path::$(pwd)/$(get_package_name)-builds-Linux.tar.gz"
+    echo "::set-output name=package_name::$(get_package_name)-builds-Linux.tar.gz"
+    echo "::set-output name=package_mime::$(file -b --mime-type "$(pwd)/$(get_package_name)-builds-Linux.tar.gz")"
 elif [ "$OS" = "Windows" ]; then
    7z a -xr'!*.pdb' "$(get_package_name)-builds-$ARCH-$SIMD.zip" "*"

-    echo "package_path=$(pwd)/$(get_package_name)-builds-$ARCH-$SIMD.zip" >> $GITHUB_OUTPUT
-    echo "package_name=$(get_package_name)-builds-$ARCH-$SIMD.zip" >> $GITHUB_OUTPUT
-    echo "package_mime=$(file -b --mime-type "$(pwd)/$(get_package_name)-builds-$ARCH-$SIMD.zip")" >> $GITHUB_OUTPUT
+    echo "::set-output name=package_path::$(pwd)/$(get_package_name)-builds-$ARCH-$SIMD.zip"
+    echo "::set-output name=package_name::$(get_package_name)-builds-$ARCH-$SIMD.zip"
+    echo "::set-output name=package_mime::$(file -b --mime-type "$(pwd)/$(get_package_name)-builds-$ARCH-$SIMD.zip")"

    7z a "$(get_package_name)-debug-$ARCH-$SIMD.7z" "*.pdb"

-    echo "debug_path=$(pwd)/$(get_package_name)-debug-$ARCH-$SIMD.7z" >> $GITHUB_OUTPUT
-    echo "debug_name=$(get_package_name)-debug-$ARCH-$SIMD.7z" >> $GITHUB_OUTPUT
-    echo "debug_mime=$(file -b --mime-type "$(pwd)/$(get_package_name)-debug-$ARCH-$SIMD.7z")" >> $GITHUB_OUTPUT
+    echo "::set-output name=debug_path::$(pwd)/$(get_package_name)-debug-$ARCH-$SIMD.7z"
+    echo "::set-output name=debug_name::$(get_package_name)-debug-$ARCH-$SIMD.7z"
+    echo "::set-output name=debug_mime::$(file -b --mime-type "$(pwd)/$(get_package_name)-debug-$ARCH-$SIMD.7z")"
 elif [ "$OS" = "Mac" ]; then
-    tar -cvzf "$(get_package_name)-builds-Mac-$ARCH.tar.gz" *.app
+    tar -cvzf "$(get_package_name)-builds-Mac.tar.gz" *

-    echo "package_path=$(pwd)/$(get_package_name)-builds-Mac-$ARCH.tar.gz" >> $GITHUB_OUTPUT
-    echo "package_name=$(get_package_name)-builds-Mac-$ARCH.tar.gz" >> $GITHUB_OUTPUT
-    echo "package_mime=$(file -b --mime-type "$(pwd)/$(get_package_name)-builds-Mac-$ARCH.tar.gz")" >> $GITHUB_OUTPUT
+    echo "::set-output name=package_path::$(pwd)/$(get_package_name)-builds-Mac.tar.gz"
+    echo "::set-output name=package_name::$(get_package_name)-builds-Mac.tar.gz"
+    echo "::set-output name=package_mime::$(file -b --mime-type "$(pwd)/$(get_package_name)-builds-Mac.tar.gz")"
 else
    echo "Invalid OS: $OS"
 fi
@@ -5,13 +5,6 @@ HERE=$(dirname "$SCRIPT")

 export LD_LIBRARY_PATH=$(pwd)/bin/lib:$LD_LIBRARY_PATH

-# if on mac and building for architecture that doesn't match host
-# then unittests will fail so we just need to skip it (for now)
-if [ "$RUNNER_OS" = "macOS" ] && [ "$ARCH" != "$(uname -m)" ]; then
-    echo "Skipping tests due to architecture mismatch!"
-    exit 0
-fi
-
 if [ "$CONFIGURATION" = "Debug"] && [[ "$RUNNER_OS" != "macOS" ]] ; then
    valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
        --suppressions="$HERE/valgrind.supp" ./bin/unittests --gtest_shuffle
@@ -10,21 +10,11 @@ HERE=$(dirname "$SCRIPT")
 source $HERE/dist_functions.sh

 if [ "$UPLOAD_TYPE" = "nightly" ]; then
-    any_success=false
-    if SSHPASS=$INDIEGAMES_SSHPASS upload_files_to_sftp "$INDIEGAMES_USER@scp.indiegames.us" "public_html/builds/nightly"; then
-        any_success=true
-    fi
+    SSHPASS=$INDIEGAMES_SSHPASS upload_files_to_sftp "$INDIEGAMES_USER@scp.indiegames.us" "public_html/builds/nightly"

-    if SSHPASS=$DATACORDER_SSHPASS upload_files_to_sftp "$DATACORDER_USER@perses.feralhosting.com" "www/datacorder.perses.feralhosting.com/public_html/builds/nightly"; then
-        any_success=true
-    fi
-
-    if [ "$any_success" = "false" ]; then
-        echo "All uploads failed"
-        exit 1
-    fi
+    SSHPASS=$DATACORDER_SSHPASS upload_files_to_sftp "$DATACORDER_USER@porphyrion.feralhosting.com" "www/datacorder.porphyrion.feralhosting.com/public_html/builds/nightly"
 elif [ "$UPLOAD_TYPE" = "test" ]; then
-    SSHPASS=$DATACORDER_SSHPASS upload_files_to_sftp "$DATACORDER_USER@perses.feralhosting.com" "www/datacorder.perses.feralhosting.com/public_html/builds/test"
+    SSHPASS=$DATACORDER_SSHPASS upload_files_to_sftp "$DATACORDER_USER@porphyrion.feralhosting.com" "www/datacorder.porphyrion.feralhosting.com/public_html/builds/test"
 else
    echo "Unknown upload type $UPLOAD_TYPE"
    exit 1
@@ -12,61 +12,6 @@ from subprocess import check_output
 MAX_PAGES = 100  # maximum number of PR pages to go through
 warnings = 0

-label_scores = {
-"fred" : 6,
-"qtfred" : 6,
-"vr" : 6,
-"multi" : 6,
-"Lab" : 6,
-"pilot file" : 6,
-"scripting" : 6,
-"sexps" : 6,
-"ai" : 6,
-"controls" : 6,
-"HUD" : 6,
-"models" : 6,
-"sound" : 6,
-"graphics" : 6,
-"physics" : 6,
-"ui" : 6,
-"localization / translation" : 6,
-"optimization" : 6,
-"gameplay" : 5,
-"general modding" : 4,
-"fix" : 3,
-"enhancement" : 2,
-"backport" : 1,
-"cleanup" : 0
-}
-
-label_to_category = {
-"fred" : "FRED",
-"qtfred" : "QtFRED",
-"vr" : "VR",
-"multi" : "Multiplayer",
-"Lab" : "Lab",
-"pilot file" : "Pilot File",
-"scripting" : "Scripting",
-"sexps" : "SEXPs",
-"ai" : "AI",
-"controls" : "Controls",
-"HUD" : "HUD",
-"models" : "Models",
-"sound" : "Sound",
-"graphics" : "Graphics",
-"physics" : "Physics",
-"ui" : "UI",
-"localization / translation" : "Localization",
-"optimization" : "Optimization",
-"gameplay" : "Gameplay",
-"general modding" : "General Modding",
-"fix" : "Fix",
-"enhancement" : "Enhancement",
-"backport" : "Backport",
-"cleanup" : "Cleanup",
-"misc" : "Misc."
-}
-
 def get_last_page(response: requests.Response) -> int:
    """
    @brief Extract the last page number from the response header
@@ -95,33 +40,7 @@ def get_last_page(response: requests.Response) -> int:
            return MAX_PAGES
        else:
            return last_page
-
-def label_score(label):
-    try:
-        return label_scores[label['name']]
-    except KeyError:
-        return -1
-
-def get_label(labels) -> str:
-    """
-    @brief Get the primary label from a list of labels
-
-    @param[in] labels The list of labels from a pull request
-
-    @returns The primary label to be used for sorting in the changelog
-    """
-    if len(labels) < 1:
-        return "misc"
-
-    # Sort the labels based on their score and grab the highest valued label
-    name = sorted(labels, key=label_score, reverse=True)[0]['name']
    
-    # If a label couldn't be found, toss it into a miscellaneous bin
-    if name not in label_scores:
-        name = "misc"
-    
-    return name
-

 def main():
    parser = argparse.ArgumentParser(description="Retrieves a log of commit messages and attempts to pretty them into a human-readable format")
@@ -219,16 +138,11 @@ def main():
                print("Found old pull #{} ({}), stopping loop...".format(pull['number'], pull['updated_at']))
                page = last_page + 1
                break
-            
-            # If a label isn't in the changelog, create a bin for it
-            label = get_label(pull['labels'])
-            if label not in changelog:
-                changelog[label] = {}

            # Add the pull to the changelog, indexed by its pull.number
-            if pull['number'] not in changelog[label]:
+            if pull['number'] not in changelog:
                # only add if the key isn't there already
-                changelog[label][pull['number']] = {
+                changelog[pull['number']] = {
                    "date":     merge_date,
                    "title":    pull['title'],
                    "labels":   pull['labels'],
@@ -244,13 +158,9 @@ def main():
    # 2021-09-28 | (#3661) Fix homing child weapons in niche circumstances 
    print("Writing to change.log...")
    str = ''
-    for label, pulls in dict(sorted(changelog.items())).items():
-        str += "[size=18pt]{}[/size]\n".format(label_to_category[label])
-        str += "[list]\n"
-        for key, value in pulls.items():
-            str += "[li](#{}) {} [/li]\n".format(key, value['title'])
-        str += "[/list]\n\n"
-
+    for key, value in changelog.items():
+        str += "{} | (#{}) {} \n".format(value['date'].strftime("%Y-%m-%d"), key, value['title'])
+    
    with open("change.log", "w") as file:
        file.write(str)

@@ -19,7 +19,7 @@
 # HLP_API:
 # HLP_KEY:

-# LINUX_RESULT: bool, if the linux builds were successfully uploaded
+# LINUX_RESULT: bool, if the linux builds were sucessfully uploaded
 # WINDOWS_RESULT: bool, if the windows builds were successfully uploaded

 import sys
@@ -137,8 +137,8 @@ def main():
 			"pass": os.environ["INDIEGAMES_SSHPASS"],
 			"path": "public_html/builds/{type}/{version}/",
 			"mirrors": (
-				"https://perses.feralhosting.com/datacorder/builds/{type}/{version}/{file}",
-				"https://scp.indiegames.us/builds/{type}/{version}/{file}",
+				"https://porphyrion.feralhosting.com/datacorder/builds/{type}/{version}/{file}",
+				"http://scp.indiegames.us/builds/{type}/{version}/{file}",
 			),
 		},
 		"nebula": {
@@ -260,10 +260,6 @@ def main():
 		if "Linux" not in groups.keys():
 			print("ERROR: No Linux builds were detected!")
 			sys.exit(1)
-
-		if "Mac" not in groups.keys():
-			print("ERROR: No Mac builds were detected!")
-			sys.exit(1)
 		
 		# z64: What dose this do???
 		# print(installer.render_installer_config(version, groups, config))
@@ -7,10 +7,8 @@ import requests
 from file_list import ReleaseFile
 from util import retry_multi, GLOBAL_TIMEOUT

-LINUX_X64_KEY = "Linux-x86_64"
-LINUX_ARM64_KEY = "Linux-arm64"
-MACOSX_X64_KEY = "Mac-x86_64"
-MACOSX_ARM64_KEY = "Mac-arm64"
+LINUX_KEY = "Linux"
+MACOSX_KEY = "Mac"
 WIN32_SSE2_KEY = "Win32-SSE2"
 WIN64_SSE2_KEY = "Win64-SSE2"
 WIN32_AVX_KEY = "Win32-AVX"
@@ -35,10 +33,8 @@ metadata = {
 }

 platforms = {
-    LINUX_X64_KEY: 'linux',
-    LINUX_ARM64_KEY: 'linux',
-    MACOSX_X64_KEY: 'macosx',
-    MACOSX_ARM64_KEY: 'macosx',
+    LINUX_KEY: 'linux',
+    MACOSX_KEY: 'macosx',
    WIN32_SSE2_KEY: 'windows',
    WIN64_SSE2_KEY: 'windows',
    WIN32_AVX_KEY: 'windows',
@@ -46,10 +42,8 @@ platforms = {
 }

 envs = {
-    LINUX_X64_KEY: 'linux && x86_64',
-    LINUX_ARM64_KEY: 'linux && arm64',
-    MACOSX_X64_KEY: 'macosx && x86_64',
-    MACOSX_ARM64_KEY: 'macosx && arm64',
+    LINUX_KEY: 'linux && x86_64',  # Linux only has 64bit builds
+    MACOSX_KEY: 'macosx',
    WIN32_SSE2_KEY: 'windows',
    WIN64_SSE2_KEY: 'windows && x86_64',
    WIN32_AVX_KEY: 'windows && avx',
@@ -116,7 +110,7 @@ def render_nebula_release(version, stability, files, config):
                'filename': dest_fn
            })

-            if group.startswith('Linux') and fn.endswith('.AppImage'):
+            if group == LINUX_KEY and fn.endswith('.AppImage'):
                if 'qtfred' in fn:
                    if '-FASTDBG' in fn:
                        label = 'QtFRED Debug'
@@ -130,8 +124,7 @@ def render_nebula_release(version, stability, files, config):
                        label = None

                props = {
-                    "arm64": "arm64" in fn,
-                    "x64": "x64" in fn,
+                    "x64": True,  # All Linux builds are 64-bit
                    "sse2": True,  # Linux builds are forced to compile with SSE2 but not AVX
                    "avx": False,
                    "avx2": False,
@@ -142,7 +135,7 @@ def render_nebula_release(version, stability, files, config):
                    'label': label,
                    'properties': props,
                })
-            elif group.startswith('Mac') and fn.startswith(os.path.basename(fn) + '.app/'):
+            elif group == MACOSX_KEY and fn.startswith(os.path.basename(fn) + '.app/'):
                if 'qtfred' in fn:
                    if '-FASTDBG' in fn:
                        label = 'QtFRED Debug'
@@ -155,8 +148,7 @@ def render_nebula_release(version, stability, files, config):
                        label = None

                props = {
-                    "arm64": "arm64" in fn,
-                    "x64": "x64" in fn,
+                    "x64": True,  # All Mac builds are 64-bit
                    "sse2": True,  # There are no forced options on mac but 64-bit always implies SSE2 so we set that here
                    "avx": False,
                    "avx2": False,
@@ -7,22 +7,22 @@ PLACEHOLDER
 [b]Deprecations:[/b]
 PLACEHOLDER

-Deprecations are a mechanism in FSO where a certain feature or aspect of the engine has changed or is no longer supported. Since this would normally break existing mods, we have the mod table feature "[tt]$Target Version:[/tt]" with which a mod can specify what version of FSO it was developed with. Any features listed under Deprecations will be removed or changed when the target version of a mod is at least the version released in this post.
+Deprecations are a mechanism in FSO where a certain feature or aspect of the engine has changed or is no longer supported. Since this would normally break existing mods we have the mod table feature "[tt]$Target Version:[/tt]" with which a mod can specify what version of FSO it was developed with. The features listed above will be removed or changed when the target version of a mod is at least the version released in this post.

-[size=5pt]Previous [url=https://www.hard-light.net/forums/index.php?topic=99015.0]23.2.1 Release Thread[/url][/size]
+[size=5pt]Previous [url=https://www.hard-light.net/forums/index.php?topic=98360.0]22.2.0 Release Thread[/url][/size]

 Launchers, if you don't have one already:
-[b]All platforms: [/b] For every day use, we recommend [url=https://knossosnet.github.io/Knossos-Release-Page/]Knossos.NET[/url], an integrated solution for downloading and launching mods.
+[b]All platforms: [/b] For every day use, we recommend [url=https://www.hard-light.net/forums/index.php?topic=94068.0]Knossos[/url], an integrated solution for downloading and launching mods.

 [hidden=Alternative Launchers]
-Cross-platform: [url=https://www.hard-light.net/forums/index.php?topic=89162]wxLauncher 0.12.x Test Build[/url] (legacy project for a unified launcher)
+Cross-platform: [url=https://www.hard-light.net/forums/index.php?topic=89162]wxLauncher 0.12.x Test Build[/url] (ongoing project for a unified launcher, you should upgrade to the latest RC/test build if you have not yet)
 [b]Important:[/b] For best compatibility with FSO 3.8 and later you should use at least wxLauncher 0.12.

-Windows:  [url=http://scp.fsmods.net/builds/Launcher55g.zip]Launcher 5.5g[/url] ([url=https://scp.indiegames.us/builds/Launcher55g.zip]Mirror[/url]) ([url=https://www.mediafire.com/?wdvzn7hhhzh418m]Mirror[/url]) Not compatible with Windows 8+, use wxLauncher above
+Windows:  [url=http://scp.fsmods.net/builds/Launcher55g.zip]Launcher 5.5g[/url] ([url=http://scp.indiegames.us/builds/Launcher55g.zip]Mirror[/url]) ([url=https://www.mediafire.com/?wdvzn7hhhzh418m]Mirror[/url]) Not compatible with Windows 8+, use wxLauncher above
 OS X:  Soulstorm's [url=https://www.hard-light.net/forums/index.php/topic,51391.0.html]OS X Launcher 3.0[/url]
 Linux:  [url=https://www.hard-light.net/forums/index.php/topic,53206.0.html]YAL[/url] or [url=https://www.hard-light.net/wiki/index.php/Fs2_open_on_Linux/Graphics_Settings]by hand[/url] or whatever you can figure out.[/hidden]

-[img]https://scp.indiegames.us/img/windows-icon.png[/img] [color=green][size=12pt]Windows (32/64-bit)[/size][/color]
+[img]http://scp.indiegames.us/img/windows-icon.png[/img] [color=green][size=12pt]Windows (32/64-bit)[/size][/color]
 [size=8pt]Compiled using GitHub Actions on Windows Server 2019 (10.0.17763), Visual Studio Enterprise 2019[/size]

 [b]64-bit:[/b] ${build(groups["Win64"].mainFile)}
@@ -41,34 +41,25 @@ Linux:  [url=https://www.hard-light.net/forums/index.php/topic,53206.0.html]YAL[

 [b]What are those SSE, SSE2 and AVX builds I keep seeing everywhere?[/b]
 [url=https://www.hard-light.net/forums/index.php?topic=65628.0]Your answer is in this topic.[/url]
-Don't want to deal with that? Use [url=https://knossosnet.github.io/Knossos-Release-Page/]Knossos.NET[/url] and it will download the best build specifically for your PC!
+Don't want to deal with that? Use [url=https://www.hard-light.net/forums/index.php?topic=94068.0]Knossos[/url] and it will download the best build specifically for your PC!
 [/hidden]

-[img]https://scp.indiegames.us/img/linux-icon.png[/img] [color=green][size=12pt]Linux[/size][/color]
-[size=8pt]Compiled with Ubuntu 20.04 LTS, GCC 9[/size]
-[b]x86_64:[/b] ${build(groups["Linux"].subFiles["x86_64"])}
-[b]arm64:[/b] ${build(groups["Linux"].subFiles["arm64"])}
+[img]http://scp.indiegames.us/img/linux-icon.png[/img] [color=green][size=12pt]Linux 64-bit[/size][/color]
+[size=8pt]Compiled with Ubuntu 16.04 LTS 64-bit, GCC 5[/size]
+${build(groups["Linux"].mainFile)}

 These builds use a mechanism called [url=https://appimage.org/]AppImage[/url] which should allow these builds to run on most Linux distributions. However, we recommend that you compile your own builds which will result in less issues.
 Alternatively, if there is a package in your software repository then you should use that. If you are the maintainer of such a package for a distribution then let us know and we will include that here.


-[img]https://scp.indiegames.us/img/mac-icon.png[/img] [color=green][size=12pt]macOS[/size][/color]
-[size=8pt]macOS 10.9+[/size]
-[b]Intel (64-bit):[/b] ${build(groups["Mac"].subFiles["x86_64"])}
-[b]Apple Silicon:[/b] ${build(groups["Mac"].subFiles["arm64"])}
-
-These builds are not signed and so by default will fail to launch. To run them simply right-click on the app, click open, then click open again on the security confirmation dialog. You should only have to do this once for each app.
-If running the game through Knossos or Knossos.NET this step should not be necessary.
-
-[size=8pt][color=red][b]NOTE:[/b][/color] macOS builds currently have limited support and may exhibit issues not present on other platforms.[/size]
-
+[img]http://scp.indiegames.us/img/mac-icon.png[/img] [color=green][size=12pt]OS X[/size][/color]
+[b][color=red]Not available[/color][/b] We recently lost access to our Mac CI environment which we usually used for compiling these builds so for the time being, there will be no builds for this OS.

 [hidden=TrackIR Users]
 [size=12pt]Important!![/size]
 An external DLL is required for FSO to use TrackIR functions.  The following DLL is simply unpacked in to your main FreeSpace2 root dir.
 TrackIR is only supported on Windows.
-[url=https://www.mediafire.com/download.php?4zw024zrh44etse]TrackIR SCP DLL[/url] ([url=http://scp.fsmods.net/builds/scptrackir.zip]Mirror[/url]) ([url=https://scp.indiegames.us/builds/scptrackir.zip]Mirror[/url])[/hidden]
+[url=https://www.mediafire.com/download.php?4zw024zrh44etse]TrackIR SCP DLL[/url] ([url=http://scp.fsmods.net/builds/scptrackir.zip]Mirror[/url]) ([url=http://scp.indiegames.us/builds/scptrackir.zip]Mirror[/url])[/hidden]

 Known issues:
 [list]
@@ -1,3 +1,3 @@
 Mako==1.2.2
-requests==2.32.0
+requests==2.26.0
 semantic-version==2.8.5
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+set -ex
+
+if [ "$NIGHTLY_BUILD" = true ]; then
+    echo "Generating bintray config..."
+    sed -e "s/\$VERSION_NAME/$VERSION_NAME/" ci/bintray.template.json > ci/bintray.json
+fi
@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+
+set -ex
+
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    export DEBIAN_FRONTEND=noninteractive
+
+    sudo add-apt-repository -y "ppa:msulikowski/valgrind" # For fixing a bug with valgrind 3.11 which does not recognize the rdrand instruction
+
+    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+    sudo add-apt-repository -y 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+
+    sudo apt-get -yq update
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    # Nothing to do here
+    :
+elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
+    # Nothing to do here
+    :
+fi
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+set -ex
+
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    mkdir -p /tmp/builds
+    if [ "$RELEASE_BUILD" = true ]; then
+        # Package the source code in release builds
+        PARENT_DIR="$(basename "$PWD")"
+        (cd .. && tar -czvf /tmp/builds/$PACKAGE_NAME-source-Unix.tar.gz --exclude-vcs "$PARENT_DIR")
+    fi
+fi
+
+mkdir -p build
+cd build
+
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
+    CFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
+
+    export CXXFLAGS
+    export CFLAGS
+    CMAKE="cmake -G Ninja -DFSO_FATAL_WARNINGS=ON $CMAKE_OPTIONS"
+    if [ "$BUILD_DEPLOYMENT" = true ]; then
+        for config in $BUILD_CONFIGS
+        do
+            mkdir -p $config
+            cd $config
+            eval $CMAKE -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_BUILD_TYPE=$config -DCMAKE_INSTALL_PREFIX="/tmp/release/$config" \
+                -DFSO_BUILD_APPIMAGE=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_QTFRED=OFF ../..
+            cd ..
+        done
+    else
+        eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=OFF ..
+    fi
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    if [ "$BUILD_DEPLOYMENT" = true ]; then
+        cmake -G "Xcode" -DFSO_FATAL_WARNINGS=ON -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_INSTALL_PREFIX="/tmp/release" ..
+    else
+        cmake -G "Xcode" $CMAKE_OPTIONS ..
+    fi
+elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
+    if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
+        cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
+            -DFSO_BUILD_FRED2="OFF" -G "$CMAKE_GENERATOR" ..
+    else
+        cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
+            -DMSVC_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "$CMAKE_GENERATOR" -T "$CMAKE_TOOLSET" ..
+    fi
+fi
@@ -0,0 +1,74 @@
+#!/usr/bin/env sh
+
+RELEASE_BUILD=false
+NIGHTLY_BUILD=false
+TEST_BUILD=false
+
+BUILD_DEPLOYMENT=false
+BUILD_CONFIGS="Release FastDebug"
+VERSION_NAME=""
+PACKAGE_NAME=""
+
+RELEASE_PATTERN="^release_(.*)$"
+NIGHTLY_PATTERN="^nightly_(.*)$"
+TEST_BUILD_PATTERN="^test\/(.*)$"
+
+# These are for testing
+NIGHTLY_TEST=false
+RELEASE_TEST=false
+TEST_BUILD_TEST=false
+
+if [ "$RELEASE_TEST" = true ] || [[ "$TRAVIS_TAG" =~ $RELEASE_PATTERN ]]; then
+    echo "This is a release tag!";
+    RELEASE_BUILD=true;
+	PACKAGE_NAME="fs2_open_${BASH_REMATCH[1]}";
+fi
+if [ "$NIGHTLY_TEST" = true ] || [[ "$TRAVIS_TAG" =~ $NIGHTLY_PATTERN ]]; then
+    echo "This is a nightly tag!";
+    NIGHTLY_BUILD=true;
+    VERSION_NAME="${BASH_REMATCH[1]}";
+	PACKAGE_NAME="nightly_${BASH_REMATCH[1]}";
+fi
+if [ "$TEST_BUILD_TEST" = true ] || [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" =~ $TEST_BUILD_PATTERN ]]; then
+    echo "This is a test build branch!";
+    TEST_BUILD=true;
+    if [ "$TEST_BUILD_TEST" = true ]; then
+        VERSION_NAME="test";
+        PACKAGE_NAME="test_test";
+    else
+        VERSION_NAME="${BASH_REMATCH[1]}";
+        PACKAGE_NAME="test_${BASH_REMATCH[1]}";
+    fi
+
+    # Override the revision string so that the builds are named correctly
+    echo "set(FSO_VERSION_REVISION_STR $VERSION_NAME)" > "$TRAVIS_BUILD_DIR/version_override.cmake"
+fi
+
+if ([ "$RELEASE_BUILD" = true ] || [ "$NIGHTLY_BUILD" = true ] || [ "$TEST_BUILD" = true ]); then
+    BUILD_DEPLOYMENT=true;
+fi
+
+if [ "$BUILD_DEPLOYMENT" = true ]; then
+    if ([ "$TRAVIS_OS_NAME" = "linux" ] && (! [[ "$CC" =~ ^gcc-5.*$ ]])); then
+        echo "Skipping non-release compiler";
+        exit 0;
+    fi
+
+    if ([[ "$CONFIGURATION" == "Debug" ]]); then
+        echo "Skipping non-release configuration";
+        exit 0;
+    fi
+
+    if [ "$TRAVIS_OS_NAME" = "windows" ]; then
+        echo "Skipping non-release platform"
+        exit 0
+    fi
+fi
+
+export RELEASE_BUILD
+export NIGHTLY_BUILD
+export TEST_BUILD
+export BUILD_DEPLOYMENT
+export BUILD_CONFIGS
+export VERSION_NAME
+export PACKAGE_NAME
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+
+if [[ ! "$(curl -V)" == *"sftp"* ]]; then
+    # Before
+    echo "Before:"
+    curl -V
+
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+
+        if [ -f ~/curl_cache/curl*.deb ]; then
+            cd ~/curl_cache
+            sudo dpkg -i libcurl3*.deb
+            sudo dpkg -i curl*.deb
+        else
+            # Since the Travis CI people are not capable of enabling SSH/SCP support for their libcurl we need to build that manually...
+            # These commands are based on the tutorial from here: http://zeroset.mnim.org/2013/03/14/sftp-support-for-curl-in-ubuntu-12-10-quantal-quetzal-and-later/
+            mkdir /tmp/curl
+            cd /tmp/curl
+            sudo apt-get update
+            sudo apt-get install build-essential debhelper libssh2-1-dev libgnutls-dev libidn11-dev libkrb5-dev libldap2-dev libnss3-dev librtmp-dev libtool openssh-server quilt
+            apt-get source curl
+            sudo apt-get build-dep curl
+
+            cd curl-*
+            export DEB_BUILD_OPTIONS="nocheck"
+            sudo dpkg-buildpackage -uc -us -j"$(grep -c ^processor /proc/cpuinfo)"
+
+            cd ..
+            dpkg -l | grep curl
+            ls -al
+
+            if [ ! -d ~/curl_cache ]; then
+                mkdir ~/curl_cache
+            fi
+
+            cp libcurl3*.deb curl*.deb ~/curl_cache
+
+            sudo dpkg -i libcurl3*.deb
+            sudo dpkg -i curl*.deb
+        fi
+    elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+        brew install libssh2
+        
+        if [ -d ~/curl_cache/curl ]; then
+            cd ~/curl_cache/curl
+            sudo make install
+        else
+            mkdir /tmp/curl
+            cd /tmp/curl
+
+            curl -LO "https://curl.haxx.se/download/curl-7.64.0.tar.bz2"
+            tar -xjf curl-7.64.0.tar.bz2
+
+            cd curl-7.64.0
+            ./configure --disable-debug --disable-dependency-tracking --disable-silent-rules --with-libssh2 --with-darwinssl --without-ca-bundle --without-ca-path
+            make -j"$(sysctl hw.logicalcpu | cut -d " " -f 2)"
+
+            if [ ! -d ~/curl_cache ]; then
+                mkdir ~/curl_cache
+            fi
+
+            cp -a . ~/curl_cache/curl
+            sudo make install
+        fi
+        export PATH=/usr/local/bin:$PATH
+    fi
+
+    # After
+    echo "After:"
+    curl -V
+fi
+
+cd /tmp/builds
+
+for file in *; do
+    if [ "$TEST_BUILD" = true ]; then
+        # Upload to datacorder
+        curl -k "sftp://porphyrion.feralhosting.com/www/datacorder.porphyrion.feralhosting.com/public_html/builds/test/$VERSION_NAME/" --user "$DATACORDER_USER:$DATACORDER_PASSWORD" -T "$file" --ftp-create-dirs
+    else
+        # Upload to indiegames
+        curl -k "sftp://scp.indiegames.us/~/public_html/builds/nightly/$VERSION_NAME/" --user "$INDIEGAMES_USER:$INDIEGAMES_PASSWORD" -T "$file" --ftp-create-dirs
+
+        # Upload to datacorder
+        curl -k "sftp://porphyrion.feralhosting.com/~/www/datacorder.porphyrion.feralhosting.com/public_html/builds/nightly/$VERSION_NAME/" --user "$DATACORDER_USER:$DATACORDER_PASSWORD" -T "$file" --ftp-create-dirs
+    fi
+done
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+set -ex
+
+FILENAME=
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    export DEBIAN_FRONTEND=noninteractive
+
+    if [ ! -d "$HOME/cmake-3.8/bin" ]; then
+        # If the cache does not currently contain CMake then download and install it
+    	mkdir -p $HOME/cmake-3.8/
+
+    	wget -O /tmp/cmake.tar.gz --no-check-certificate https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz
+    	tar -xzf /tmp/cmake.tar.gz -C $HOME/cmake-3.8/ --strip-components=1
+    fi
+    export PATH=$HOME/cmake-3.8/bin:$PATH
+    
+    cd $HOME
+    
+    if [ "${BUILD_DEPLOYMENT}" = true ]; then
+        wget -O appimagetool -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" # (64-bit)
+        chmod a+x ./appimagetool
+
+        wget -O linuxdeployqt -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" # (64-bit)
+        chmod a+x ./linuxdeployqt
+    fi
+
+    sudo apt-get -yq install valgrind
+
+    if [[ "$CC" = "clang-9" ]]; then
+      sudo apt-get -yq install clang-9 clang-tidy-9
+    fi
+
+    if [[ "$CC" = "clang-4.0" ]]; then
+      # Fix a header bug present in ubuntu...
+      sudo ln -s /usr/include/libcxxabi/__cxxabi_config.h /usr/include/c++/v1/__cxxabi_config.h
+    fi
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    gem install xcpretty
+    
+    brew update
+    brew outdated cmake || brew upgrade cmake
+elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
+    choco install mingw ninja
+fi
+
+cmake --version
@@ -0,0 +1,68 @@
+#!/usr/bin/env sh
+
+set -ex
+mkdir -p /tmp/builds
+
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+	cd build
+    for config in $BUILD_CONFIGS
+    do
+        cd "$config"
+
+        # Compile all targets
+        ninja all
+
+        # Install Freespace2 targets
+        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/fso -DCOMPONENT=Unspecified -P cmake_install.cmake
+        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/fso -DCOMPONENT=Freespace2 -P cmake_install.cmake
+
+        # We need to be a bit creative for determining the AppImage name since we don't want to hard-code the name
+        FILENAME="$(find /tmp/release/$config/fso/bin -name 'fs2_open_*' -type f -printf "%f\n").AppImage"
+        $HOME/appimagetool -n /tmp/release/$config/fso "/tmp/release/$config/fso/$FILENAME"
+
+: <<'END'
+        # Install qtFRED targets
+        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/qtfred/usr -DCOMPONENT=Unspecified -P cmake_install.cmake
+        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/qtfred/usr -DCOMPONENT=qtFRED -P cmake_install.cmake
+
+        PREV="$(pwd)"
+        cd /tmp/release/$config/qtfred
+
+        unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH
+        $HOME/linuxdeployqt usr/qtfred.desktop -bundle-non-qt-libs
+        # Move our AppRun script to the right location
+        mv usr/AppRun AppRun
+
+        echo "Embed newer libstdc++ for distros that don't come with it (ubuntu 14.04)";
+        mkdir -p usr/optional/; mkdir -p usr/optional/libstdc++/;
+        cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./usr/optional/libstdc++/;
+
+        $HOME/appimagetool -n . "$(find /tmp/release/$config/qtfred/usr/bin -name 'qtfred_*' -type f -printf "%f\n").AppImage"
+
+        cd "$PREV"
+END
+
+        cd ..
+    done
+
+    cp `find /tmp/release -name '*.AppImage' -print` /tmp/release
+    (cd /tmp/release && tar -cvzf /tmp/builds/$PACKAGE_NAME-builds-Linux.tar.gz *.AppImage)
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    cd build
+    
+    for config in $BUILD_CONFIGS
+    do
+        cmake --build . --config "$config" --target install | tee build.log \
+            | xcpretty
+        XCODE_RET=${PIPESTATUS[0]}
+        if [ "$XCODE_RET" -ne "0" ]; then
+            tar -cvzf build.log.tar.gz build.log
+            curl --upload-file build.log.tar.gz "https://transfer.sh/build.log.tar.gz"
+            exit $XCODE_RET
+        fi
+    done
+
+    ls -al /tmp/release
+    
+    (cd /tmp/release && tar -cvzf /tmp/builds/$PACKAGE_NAME-builds-MacOSX.tar.gz *)
+fi
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+set -e
+
+cd build
+
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    ninja -k 20 all
+
+    if [ "$CONFIGURATION" = "Debug" ]; then
+        valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
+            --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
+    else
+        ./bin/unittests --gtest_shuffle
+    fi
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    cmake --build . --config "$CONFIGURATION" | tee build.log | xcpretty
+    XCODE_RET=${PIPESTATUS[0]}
+    if [ "$XCODE_RET" -ne "0" ]; then
+        tar -cvzf build.log.tar.gz build.log
+        curl --upload-file build.log.tar.gz "https://keep.sh"
+        exit $XCODE_RET
+    fi
+elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
+    if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
+        cmake --build . --config "$CONFIGURATION"
+    else
+        cmake --build . --config "$CONFIGURATION" -- /verbosity:minimal
+    fi
+fi
@@ -2,72 +2,50 @@
 #ifdef _WIN32
 #include <intrin.h>
 //  Windows
-#define cpuid    __cpuidex
-#define xgetbv   _xgetbv
+#define cpuid    __cpuid

 #else

-#include <cstdint>
-
 //  GCC Inline Assembly
-void cpuid(int CPUInfo[4], int InfoType, int SubType){
+void cpuid(int CPUInfo[4],int InfoType){
    __asm__ __volatile__ (
        "cpuid":
        "=a" (CPUInfo[0]),
        "=b" (CPUInfo[1]),
        "=c" (CPUInfo[2]),
        "=d" (CPUInfo[3]) :
-        "a" (InfoType),
-		"c" (SubType)
+        "a" (InfoType)
    );
 }

-uint64_t xgetbv(uint32_t xcr) {
-	uint32_t lower, higher;
-	__asm__ __volatile__ (
-		"xgetbv":
-		"=a"(lower),
-		"=d"(higher) :
-		"c"(xcr)
-	);
-	return (static_cast<uint64_t>(higher) << static_cast<uint64_t>(32)) | static_cast<uint64_t>(lower);
-}
-
 #endif

 #include <iostream>

 int main( int argc, char* argv[] )
 {
-	bool SSE     = false;
-	bool SSE2    = false;
-	bool OSXSAVE = false;
-	bool AVX     = false;
-	bool AVX2    = false;
+	int SSE     = false;
+	int SSE2    = false;
+	int AVX     = false;
+	int AVX2    = false;

 	int info[4];
-	cpuid(info, 0, 0);
+	cpuid(info, 0);
 	int nIds = info[0];

 	//  Detect Instruction Set
 	if (nIds >= 1){
-		cpuid(info, 0x00000001, 0);
-		SSE     = (info[3] & ((int)1 << 25)) != 0;
-		SSE2    = (info[3] & ((int)1 << 26)) != 0;
-		OSXSAVE = (info[2] & ((int)1 << 27)) != 0;
-		AVX     = (info[2] & ((int)1 << 28)) != 0;
+		cpuid(info,0x00000001);
+		SSE   = (info[3] & ((int)1 << 25)) != 0;
+		SSE2  = (info[3] & ((int)1 << 26)) != 0;
+
+		AVX   = (info[2] & ((int)1 << 28)) != 0;
 	}
 	if (nIds >= 7){
-		cpuid(info,0x00000007, 0);
+		cpuid(info,0x00000007);
 		AVX2  = (info[1] & ((int)1 <<  5)) != 0;
 	}

-	//  Detect OS Support
-	if (!OSXSAVE || (xgetbv(0) & 0x6) == 0) {
-		AVX = false;
-		AVX2 = false;
-	}
-
 	if (AVX2)
 		std::cout << "AVX2";
 	else if(AVX)
@@ -24,19 +24,3 @@ set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-if (FSO_BUILD_WITH_DISCORD)
-    message(WARNING "Discord support is not tested for cross-compilation. Here be dragons! To disable, set -DFSO_BUILD_WITH_DISCORD:BOOL=OFF")
-endif()
-
-if (FSO_BUILD_FRED2)
-    message(WARNING "FRED2 support is not tested for cross-compilation. Here be dragons! To disable, set -DFSO_BUILD_FRED2:BOOL=OFF")
-endif()
-
-if (FSO_USE_SPEECH)
-    message(WARNING "Speech support is not tested for cross-compilation. Here be dragons! To disable, set -DFSO_USE_SPEECH:BOOL=OFF")
-endif()
-
-if (FSO_USE_VOICEREC)
-    message(WARNING "Voice recognition support is not tested for cross-compilation. Here be dragons! To disable, set -DFSO_USE_VOICEREC:BOOL=OFF")
-endif()
@@ -97,19 +97,9 @@ function(handle_embedded_files _target)
        set(INCLUDE_LIST "${INCLUDE_LIST}\n#include \"${HEADER_FILE}\"")
        set(ARRAY_ELEMENTS "${ARRAY_ELEMENTS}\n\t{ \"${_pathType}\", \"${FILE_NAME}\" , ${FIELD_NAME} , ${FIELD_NAME}_size },")

-        IF(CMAKE_CROSSCOMPILING)
-            SET(EMBEDFILE_PATH "EMBEDFILE-NOTFOUND" CACHE FILEPATH "Required for a cross compiling build, point to an embedfile of a cmake build for the host OS")
-            IF(EMBEDFILE_PATH STREQUAL "EMBEDFILE-NOTFOUND")
-                #This could, possibly, be configured to compile an embedfile using host compilation automatically, but that seems to be a challenge.
-                message(FATAL_ERROR "A manual embedfile path must be configured for cross compilation. Set EMBEDFILE_PATH to the location of an embedfile executable, found in the build directories for the host OS.")
-            ENDIF()
-        ELSE(CMAKE_CROSSCOMPILING)
-            SET(EMBEDFILE_PATH "embedfile")
-        ENDIF(CMAKE_CROSSCOMPILING)
-
        add_custom_command(
            OUTPUT ${ALL_OUTPUTS}
-            COMMAND ${EMBEDFILE_PATH} "${_filePath}" "${_outputBasePath}" "${FIELD_NAME}"
+            COMMAND embedfile "${_filePath}" "${_outputBasePath}" "${FIELD_NAME}"
            MAIN_DEPENDENCY "${_filePath}"
            COMMENT "Generating string file for ${_filePath}"
        )
@@ -7,32 +7,3 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
 else()
    set(IS_64BIT FALSE)
 endif()
-
-set(IS_ARM64 FALSE)
-
-if (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "")   # needed to cover Visual Studio generator
-    if(CMAKE_GENERATOR_PLATFORM MATCHES "^(aarch64|arm64|ARM64)")
-        set(IS_ARM64 TRUE)
-    endif()
-else()
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64)")
-        set(IS_ARM64 TRUE)
-    endif()
-endif()
-
-set(IS_RISCV FALSE)
-
-if (NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "")   # needed to cover Visual Studio generator
-    if(CMAKE_GENERATOR_PLATFORM MATCHES "^(riscv64|RISCV64|riscv32|RISCV32)")
-        set(IS_RISCV TRUE)
-    endif()
-else()
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(riscv64|RISCV64|riscv32|RISCV32)")
-        set(IS_RISCV TRUE)
-    endif()
-endif()
-
-set(IS_X86 FALSE)
-if (NOT IS_ARM64 AND NOT IS_RISCV)
-    set(IS_X86 TRUE)
-endif()
@@ -11,8 +11,7 @@ endif()

 target_link_libraries(platform INTERFACE ${COCOA_LIBRARY})

-# To support C++17 we need to target at least 10.13. maybe 10.14 for some rare features
-SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
+SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")

 SET(CMAKE_SKIP_RPATH FALSE)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
@@ -23,14 +22,6 @@ SET(LIBRAY_DESTINATION "../Frameworks")

 set(PLATFORM_MAC TRUE CACHE INTERNAL "" FORCE)

-# Maybe override arm64 setting if we are compiling for different architecture
-# If not specified, or if it's a universal build, then this should do nothing
-if(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
-    set(IS_ARM64 TRUE)
-elseif(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-    set(IS_ARM64 FALSE)
-endif()
-
 # Generate and don't strip debug symbols
 # These settings don't seem to generate debug symbols for code and Freespace2
 # so those settings are set manually in code and Freespace2's CMakeLists.txt files
@@ -9,8 +9,6 @@
 #cmakedefine SCP_HAVE_STD_MAX_ALIGN_T

 #cmakedefine01 IS_64BIT
-#cmakedefine01 IS_ARM64
-#cmakedefine01 IS_RISCV

 #cmakedefine01 SCP_HAVE_STRCASECMP
 #cmakedefine01 SCP_HAVE_STRNCASECMP
@@ -4,7 +4,7 @@ MESSAGE(STATUS "Doing configuration specific to Apple Clang...")
 # TODO: Actually add Mac specific flags here...

 # Suppress specific warning
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fsigned-char -Wno-unknown-pragmas")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -funroll-loops -fsigned-char -Wno-unknown-pragmas")

 # Omit "conversion from string literal to 'char *' is deprecated" warnings.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
@@ -13,6 +13,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-char-subscripts")

 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")

-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wno-unused-variable -Wno-unused-parameter")
+set(CMAKE_CXX_FLAGS_RELEASE "-Wno-unused-variable")

-set(CMAKE_CXX_FLAGS_DEBUG "-Og -g -Wshadow")
+set(CMAKE_CXX_FLAGS_DEBUG "-Wextra -Wshadow -Wno-unused-parameter")
@@ -10,41 +10,8 @@ option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF)
 option(CLANG_USE_LIBCXX "Use libc++" OFF)

 # These are the default values
-set(C_BASE_FLAGS "-pipe")
-set(CXX_BASE_FLAGS "-pipe")
-
-if(IS_X86)
-	if(FORCED_NATIVE_SIMD_INSTRUCTIONS)
-		set(CLANG_EXTENSIONS "-march=native")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "")
-		set(CLANG_EXTENSIONS "-march=x86-64")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "SSE")
-		set(CLANG_EXTENSIONS "-march=x86-64 -msse -mfpmath=sse")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "SSE2")
-		set(CLANG_EXTENSIONS "-march=x86-64 -msse -msse2 -mfpmath=sse")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "AVX")
-		set(CLANG_EXTENSIONS "-march=x86-64-v2 -msse -msse2 -mavx -mfpmath=sse")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "AVX2")
-		set(CLANG_EXTENSIONS "-march=x86-64-v3 -msse -msse2 -mavx -mavx2 -mfpmath=sse")
-	else ()
-		message( FATAL_ERROR "Unknown instruction set encountered for clang. Update toolchain-clang.cmake!" )
-	endif()
-
-	set(C_BASE_FLAGS "${C_BASE_FLAGS} ${CLANG_EXTENSIONS}")
-	set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} ${CLANG_EXTENSIONS}")
-elseif(IS_ARM)
-	if(FORCED_NATIVE_SIMD_INSTRUCTIONS)
-		set(C_BASE_FLAGS "${C_BASE_FLAGS} -march=native")
-		set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -march=native")
-    endif ()
-elseif(IS_RISCV)
-    # Default C/CXX_BASE_FLAGS are fine for RISC-V
-endif()
-
-if (USE_STATIC_LIBCXX)
-	set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -static-libstdc++ -Qunused-arguments")
-	set(CLANG_USE_LIBCXX ON)
-endif()
+set(C_BASE_FLAGS "-march=native -pipe")
+set(CXX_BASE_FLAGS "-march=native -pipe")

 # For C and C++, the values can be overwritten independently
 if(DEFINED ENV{CXXFLAGS})
@@ -66,8 +33,12 @@ set(COMPILER_FLAGS "")
 _enable_extra_compiler_warnings_flags()
 set(COMPILER_FLAGS "${COMPILER_FLAGS} ${_flags}")

-set(COMPILER_FLAGS "${COMPILER_FLAGS} -fsigned-char -Wno-unknown-pragmas")
+set(COMPILER_FLAGS "${COMPILER_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")

+# Omit "argument unused during compilation" when clang is used with ccache.
+if(${CMAKE_CXX_COMPILER} MATCHES "ccache")
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Qunused-arguments")
+endif()

 if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
 	# Force color diagnostics for Ninja generator
@@ -112,41 +83,20 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
 endif()

-# Check if there is a user-set optimisation flag
-string(REGEX MATCH "-O[a-zA-Z|0-9]+" CXX_OPT_FLAG ${CXX_BASE_FLAGS})
-string(REGEX MATCH "-O[a-zA-Z|0-9]+" C_OPT_FLAG ${C_BASE_FLAGS})
+set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-parameter")

-# If no user-set opt flag, set -O3 and -Og
-if ("${CXX_OPT_FLAG}" STREQUAL "")
-	set(CXX_OPT_FLAG_RELEASE "-O3")
-	set(CXX_OPT_FLAG_DEBUG "-Og")
-else()
-	set(CXX_OPT_FLAG_RELEASE "${CXX_OPT_FLAG}")
-	set(CXX_OPT_FLAG_DEBUG "${CXX_OPT_FLAG}")
-endif()
-if ("${C_OPT_FLAG}" STREQUAL "")
-	set(C_OPT_FLAG_RELEASE "-O3")
-	set(C_OPT_FLAG_DEBUG "-Og")
-else()
-	set(C_OPT_FLAG_RELEASE "${C_OPT_FLAG}")
-	set(C_OPT_FLAG_DEBUG "${C_OPT_FLAG}")
-endif()
+set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")

-set(CXX_FLAGS_RELEASE "${CXX_OPT_FLAG_RELEASE} -Wno-unused-variable -Wno-unused-parameter")
-set(C_FLAGS_RELEASE "${C_OPT_FLAG_RELEASE} -Wno-unused-variable -Wno-unused-parameter")
-
-set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -g -Wshadow")
-set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -g -Wshadow")
-
-# Always use the base flags and add our compiler flags at the back
+# Always use the base flags and add our compiler flags at the bacl
 set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
 set(CMAKE_C_FLAGS "${C_BASE_FLAGS} ${COMPILER_FLAGS}")

-set(CMAKE_CXX_FLAGS_RELEASE ${CXX_FLAGS_RELEASE})
-set(CMAKE_C_FLAGS_RELEASE ${C_FLAGS_RELEASE})
+set(CMAKE_CXX_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+
+set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})

-set(CMAKE_CXX_FLAGS_DEBUG ${CXX_FLAGS_DEBUG})
-set(CMAKE_C_FLAGS_DEBUG ${C_FLAGS_DEBUG})

 set(CMAKE_EXE_LINKER_FLAGS "")

@@ -170,7 +120,7 @@ if (FSO_FATAL_WARNINGS)
 	target_compile_options(compiler INTERFACE "-Werror")
 endif()

-# Always define this to make sure that the fixed-width format macros are available
+# Always define this to make sure that the fixed width format macros are available
 target_compile_definitions(compiler INTERFACE __STDC_FORMAT_MACROS)

 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR MINGW)
@@ -12,49 +12,8 @@ option(GCC_USE_GOLD "Use the gold linker instead of the standard linker" OFF)
 option(GCC_GENERATE_GDB_INDEX "Adds linker option to generate the gdb index for debug builds" OFF)

 # These are the default values
-set(C_BASE_FLAGS "-pipe")
-set(CXX_BASE_FLAGS "-pipe")
-
-if(IS_X86)
-	if(FORCED_NATIVE_SIMD_INSTRUCTIONS)
-		set(GCC_EXTENSIONS "-march=native")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "")
-		set(GCC_EXTENSIONS "-march=x86-64")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "SSE")
-		set(GCC_EXTENSIONS "-march=x86-64 -msse -mfpmath=sse")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "SSE2")
-		set(GCC_EXTENSIONS "-march=x86-64 -msse -msse2 -mfpmath=sse")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "AVX")
-		set(GCC_EXTENSIONS "-march=x86-64-v2 -msse -msse2 -mavx -mfpmath=sse")
-	elseif (FSO_INSTRUCTION_SET STREQUAL "AVX2")
-		set(GCC_EXTENSIONS "-march=x86-64-v3 -msse -msse2 -mavx -mavx2 -mfpmath=sse")
-	else ()
-		message( FATAL_ERROR "Unknown instruction set encountered for GCC. Update toolchain-gcc.cmake!" )
-	endif()
-
-	set(C_BASE_FLAGS "${C_BASE_FLAGS} ${GCC_EXTENSIONS}")
-	set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} ${GCC_EXTENSIONS}")
-
-	if (IS_64BIT)
-		set(C_BASE_FLAGS "${C_BASE_FLAGS} -m64")
-		set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -m64")
-	endif()
-elseif(IS_ARM)
-	if(FORCED_NATIVE_SIMD_INSTRUCTIONS)
-		set(C_BASE_FLAGS "${C_BASE_FLAGS} -march=native")
-		set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -march=native")
-    endif ()
-elseif(IS_RISCV)
-    # You do not need to pass a -march, passing nothing will make gcc to choose itself.
-    # If you want a specific set of instructions like vectors, set -march in CFLAGS and CXXFLAGS env variables
-    # Example for vectors: -march=rv64gcv
-    # https://gcc.gnu.org/onlinedocs/gcc/RISC-V-Options.html
-    # As such, default C/CXX_BASE_FLAGS are sufficient.
-endif()
-
-if (USE_STATIC_LIBCXX)
-	set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -static-libstdc++")
-endif()
+set(C_BASE_FLAGS "-march=native -pipe")
+set(CXX_BASE_FLAGS "-march=native -pipe")

 # For C and C++, the values can be overwritten independently
 if(DEFINED ENV{CFLAGS})
@@ -86,7 +45,7 @@ endif()
 _enable_extra_compiler_warnings_flags()
 set(COMPILER_FLAGS "${COMPILER_FLAGS} ${_flags}")

-set(COMPILER_FLAGS "${COMPILER_FLAGS} -fsigned-char -Wno-unknown-pragmas")
+set(COMPILER_FLAGS "${COMPILER_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")

 if (NOT GCC_INCREMENTAL_LINKING)
 	# Place each function and data in its own section so the linker can
@@ -154,41 +113,19 @@ if(SUPPORTS_STRINGOP_TRUNCATION)
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-stringop-overflow")
 endif()

-# Check if there is a user-set optimisation flag
-string(REGEX MATCH "-O[a-zA-Z|0-9]+" CXX_OPT_FLAG ${CXX_BASE_FLAGS})
-string(REGEX MATCH "-O[a-zA-Z|0-9]+" C_OPT_FLAG ${C_BASE_FLAGS})
+set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered  -Wno-unused-parameter")

-# If no user-set opt flag, set -O3 and -Og
-if ("${CXX_OPT_FLAG}" STREQUAL "")
-	set(CXX_OPT_FLAG_RELEASE "-O3")
-	set(CXX_OPT_FLAG_DEBUG "-Og")
-else()
-	set(CXX_OPT_FLAG_RELEASE "${CXX_OPT_FLAG}")
-	set(CXX_OPT_FLAG_DEBUG "${CXX_OPT_FLAG}")
-endif()
-if ("${C_OPT_FLAG}" STREQUAL "")
-	set(C_OPT_FLAG_RELEASE "-O3")
-	set(C_OPT_FLAG_DEBUG "-Og")
-else()
-	set(C_OPT_FLAG_RELEASE "${C_OPT_FLAG}")
-	set(C_OPT_FLAG_DEBUG "${C_OPT_FLAG}")
-endif()
-
-set(CXX_FLAGS_RELEASE "${CXX_OPT_FLAG_RELEASE} -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered -Wno-unused-parameter")
-set(C_FLAGS_RELEASE "${C_OPT_FLAG_RELEASE} -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered -Wno-unused-parameter")
-
-set(CXX_FLAGS_DEBUG "${CXX_OPT_FLAG_DEBUG} -g -Wshadow")
-set(C_FLAGS_DEBUG "${C_OPT_FLAG_DEBUG} -g -Wshadow")
+set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")

 # Always use the base flags and add our compiler flags at the back
 set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
 set(CMAKE_C_FLAGS "${C_BASE_FLAGS} ${COMPILER_FLAGS}")

-set(CMAKE_CXX_FLAGS_RELEASE ${CXX_FLAGS_RELEASE})
-set(CMAKE_C_FLAGS_RELEASE ${C_FLAGS_RELEASE})
+set(CMAKE_CXX_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})

-set(CMAKE_CXX_FLAGS_DEBUG ${CXX_FLAGS_DEBUG})
-set(CMAKE_C_FLAGS_DEBUG ${C_FLAGS_DEBUG})
+set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})

 set(CMAKE_EXE_LINKER_FLAGS "${LINKER_FLAGS}")

@@ -228,7 +165,7 @@ if (FSO_FATAL_WARNINGS)
 	target_compile_options(compiler INTERFACE "-Werror")
 endif()

-# Always define this to make sure that the fixed-width format macros are available
+# Always define this to make sure that the fixed width format macros are available
 target_compile_definitions(compiler INTERFACE __STDC_FORMAT_MACROS=1)

 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR MINGW)
@@ -46,13 +46,9 @@ target_compile_options(compiler INTERFACE ${WARNING_FLAGS})
 set(CMAKE_C_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /Zc:forScope /Gd /EHsc /nologo /Zm200")
 set(CMAKE_CXX_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /Zc:forScope /Gd /EHsc /nologo /Zm200")

-set(CMAKE_EXE_LINKER_FLAGS "/MANIFEST /SAFESEH:NO /ERRORREPORT:PROMPT /NOLOGO")
+set(CMAKE_EXE_LINKER_FLAGS "/MANIFEST /DYNAMICBASE:NO /SAFESEH:NO /ERRORREPORT:PROMPT /NOLOGO")
 set(CMAKE_STATIC_LINKER_FLAGS "")

-if(NOT IS_ARM64)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DYNAMICBASE:NO")
-endif()
-
 # Release
 set(CMAKE_C_FLAGS_RELEASE "/GL /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
 set(CMAKE_CXX_FLAGS_RELEASE "/GL /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
@@ -95,31 +91,49 @@ ENDIF(MSVC_USE_RUNTIME_DLL)
 INCLUDE(MSVCMultipleProcessCompile)

 # Visual Studio supports compiling for multiple vector instruction sets
+SET(POSSIBLE_INSTUCTION_SETS "" SSE SSE2 AVX AVX2)

-if(IS_X86)
-	if(FORCED_NATIVE_SIMD_INSTRUCTIONS)
-		# MSVC has no direct -march=native equivalent, so just use the detected extensions.
-		SET(FSO_INSTRUCTION_SET ${DETECTED_SIMD_INSTRUCTIONS})
-	endif()
+if (NOT DEFINED MSVC_SIMD_INSTRUCTIONS)
+	detect_simd_instructions(MSVC_DETECTED_SIMD_INSTRUCTIONS)

-	if(FSO_INSTRUCTION_SET STREQUAL "")
-		set(MSVC_SIMD_INSTRUCTIONS "IA32")
-	else()
-		set(MSVC_SIMD_INSTRUCTIONS ${FSO_INSTRUCTION_SET})
-	endif()
+	SET(MSVC_SIMD_INSTRUCTIONS "${MSVC_DETECTED_SIMD_INSTRUCTIONS}" CACHE FILEPATH "The SIMD instructions which will be used, possible values are ${POSSIBLE_INSTUCTION_SETS}")
+	MARK_AS_ADVANCED(FORCE MSVC_SIMD_INSTRUCTIONS)
+endif()
+set(FSO_INSTRUCTION_SET ${MSVC_SIMD_INSTRUCTIONS})

-	if (NOT (IS_64BIT AND (MSVC_SIMD_INSTRUCTIONS STREQUAL "IA32" OR MSVC_SIMD_INSTRUCTIONS STREQUAL "SSE" OR MSVC_SIMD_INSTRUCTIONS STREQUAL "SSE2")))
-		# 32-Bit and SSE(2) mustn't be set, as these are implied in x86_64 and thus MSVC does not support it for the /arch argument
-		CHECK_CXX_COMPILER_FLAG("/arch:${MSVC_SIMD_INSTRUCTIONS}" COMPILER_SUPPORTS_ARCH)
+LIST(FIND POSSIBLE_INSTUCTION_SETS "${MSVC_SIMD_INSTRUCTIONS}" SET_INDEX)

-		IF(COMPILER_SUPPORTS_ARCH)
-			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:${MSVC_SIMD_INSTRUCTIONS}")
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:${MSVC_SIMD_INSTRUCTIONS}")
-		ELSE()
-			message( FATAL_ERROR "Your version of MSVC does not support the requested instruction set. Consider updating!" )
-		ENDIF()
-	endif()
+if (SET_INDEX LESS 0)
+	MESSAGE(STATUS "An invalid instruction set was specified, defaulting to no special compiler options.")
+else()
+	IF (NOT SET_INDEX EQUAL 0)
+		SET(FOUND)

+		FOREACH(list_index RANGE ${SET_INDEX} 1)
+			list(GET POSSIBLE_INSTUCTION_SETS ${list_index} _simd_set)
+			CHECK_CXX_COMPILER_FLAG("/arch:${_simd_set}" COMPILER_SUPPORTS_ARCH_${_simd_set})
+
+			IF(COMPILER_SUPPORTS_ARCH_${_simd_set})
+				set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:${_simd_set}")
+				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:${_simd_set}")
+
+				SET(FOUND TRUE)
+				BREAK()
+			ENDIF()
+		ENDFOREACH(list_index)
+
+		IF(NOT FOUND)
+			# Don't set anything, it will likely not work
+			MESSAGE(STATUS "Your compiler does not support any optimization flags, defaulting to none")
+		ENDIF(NOT FOUND)
+	ELSE()
+		CHECK_CXX_COMPILER_FLAG("/arch:IA32" COMPILER_SUPPORTS_ARCH_IA32)
+
+		IF(COMPILER_SUPPORTS_ARCH_IA32)
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:IA32")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:IA32")
+		ENDIF(COMPILER_SUPPORTS_ARCH_IA32)
+	ENDIF()
 endif()

 target_compile_definitions(compiler INTERFACE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _SECURE_SCL=0 NOMINMAX
@@ -5,55 +5,6 @@ add_library(compiler INTERFACE)

 target_compile_definitions(compiler INTERFACE "$<$<CONFIG:Release>:NDEBUG>;$<$<CONFIG:Debug>:_DEBUG>;$<$<CONFIG:FastDebug>:_DEBUG>")

-set(FORCED_NATIVE_SIMD_INSTRUCTIONS ON CACHE BOOL "Override instruction set detection and compile with the maximum possible instructions for the current system.")
-IF(IS_X86)
-	SET(POSSIBLE_INSTRUCTION_SETS "" SSE SSE2 AVX AVX2)
-	if (CMAKE_CROSSCOMPILING)
-		message("Cross-Compile cannot detect supported instruction sets. Defaulting to SSE2. Disabling host-optimization.")
-		set(FORCED_NATIVE_SIMD_INSTRUCTIONS OFF)
-		set(DETECTED_SIMD_INSTRUCTIONS SSE2)
-	else()
-		detect_simd_instructions(DETECTED_SIMD_INSTRUCTIONS)
-	endif()
-
-	set(FORCED_SIMD_INSTRUCTIONS "" CACHE STRING "Overrides any instruction set settings (including forced-native). Any of ${POSSIBLE_INSTRUCTION_SETS}.")
-	if (NOT FORCED_SIMD_INSTRUCTIONS STREQUAL "")
-		set(FORCED_NATIVE_SIMD_INSTRUCTIONS OFF)
-		LIST(FIND POSSIBLE_INSTRUCTION_SETS "${FORCED_SIMD_INSTRUCTIONS}" SET_INDEX)
-
-		if (SET_INDEX LESS 0)
-			MESSAGE(STATUS "An invalid instruction set was specified, defaulting to no special compiler options.")
-			set(FSO_INSTRUCTION_SET "")
-		else ()
-			LIST(FIND POSSIBLE_INSTRUCTION_SETS "${DETECTED_SIMD_INSTRUCTIONS}" SET_INDEX)
-			if (SET_INDEX LESS 0)
-				MESSAGE(STATUS "An instruction set was specified which is unsupported on this platform. Compiled binary might not be executable.")
-			endif()
-
-			set(FSO_INSTRUCTION_SET ${FORCED_SIMD_INSTRUCTIONS})
-		endif()
-	else()
-		SET(FSO_INSTRUCTION_SET ${DETECTED_SIMD_INSTRUCTIONS})
-	endif()
-	MESSAGE(STATUS "Using instruction set level ${FSO_INSTRUCTION_SET}. Optimizations for host-system specifically: ${FORCED_NATIVE_SIMD_INSTRUCTIONS}.")
-
-	if (FSO_INSTRUCTION_SET STREQUAL "SSE")
-		add_compile_definitions(FSO_SIMD_SSE)
-	elseif (FSO_INSTRUCTION_SET STREQUAL "SSE2")
-		add_compile_definitions(FSO_SIMD_SSE)
-		add_compile_definitions(FSO_SIMD_SSE2)
-	elseif (FSO_INSTRUCTION_SET STREQUAL "AVX")
-		add_compile_definitions(FSO_SIMD_SSE)
-		add_compile_definitions(FSO_SIMD_SSE2)
-		add_compile_definitions(FSO_SIMD_AVX)
-	elseif (FSO_INSTRUCTION_SET STREQUAL "AVX2")
-		add_compile_definitions(FSO_SIMD_SSE)
-		add_compile_definitions(FSO_SIMD_SSE2)
-		add_compile_definitions(FSO_SIMD_AVX)
-		add_compile_definitions(FSO_SIMD_AVX2)
-	endif()
-ENDIF()
-
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	include(toolchain-gcc)
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -67,43 +67,30 @@ ENDIF(EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${FILE}\")
 ENDFUNCTION(EP_CHECK_FILE_EXISTS)

 MACRO(COPY_FILE_TO_TARGET _target _file)
-	if (IS_DIRECTORY "${_file}")
-		get_filename_component(_dirName "${_file}" NAME)
-		if (PLATFORM_MAC AND ("${_file}" MATCHES ".framework$"))
-			# This is stupid, but it preserves symlinks, unlike copy_directory_if_different.
-			# Otherwise we end up creating duplicate files in the copied framework.
-			ADD_CUSTOM_COMMAND(
-					TARGET ${_target} POST_BUILD
-					COMMAND rsync -rlq "${_file}" "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}"
-					COMMENT "copying '${_file}'..."
-					VERBATIM
-			)
-		else()
-			ADD_CUSTOM_COMMAND(
-					TARGET ${_target} POST_BUILD
-					COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${_file}" "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/${_dirName}"
-					COMMENT "copying '${_file}'..."
-					VERBATIM
-			)
-		endif()
+	if(UNIX)
+		ADD_CUSTOM_COMMAND(
+			TARGET ${_target} POST_BUILD
+			COMMAND cp -a "${_file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
+			COMMENT "copying '${_file}'..."
+		)
 	else()
 		ADD_CUSTOM_COMMAND(
-				TARGET ${_target} POST_BUILD
-				COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_file}" "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-				COMMENT "copying '${_file}'..."
-				VERBATIM
+			TARGET ${_target} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
+			COMMENT "copying '${_file}'..."
 		)
 	endif()
 endmacro(COPY_FILE_TO_TARGET)

 MACRO(COPY_FILES_TO_TARGET _target)
-	ADD_CUSTOM_COMMAND(
-		TARGET ${_target} POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-		COMMENT "Creating '$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/'..."
-		VERBATIM
-	)
-
+	if(UNIX)
+		ADD_CUSTOM_COMMAND(
+			TARGET ${_target} POST_BUILD
+			COMMAND mkdir -p "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
+			COMMENT "Creating '$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/'..."
+		)
+	endif()
+	
 	FOREACH(file IN LISTS TARGET_COPY_FILES)
 		COPY_FILE_TO_TARGET("${_target}" "${file}")
 	ENDFOREACH(file)
@@ -6,7 +6,7 @@ if (EXISTS "${PROJECT_SOURCE_DIR}/version_override.cmake")
    include("${PROJECT_SOURCE_DIR}/version_override.cmake")
 endif()

-set_if_not_defined(FSO_VERSION_MAJOR 24)
+set_if_not_defined(FSO_VERSION_MAJOR 22)
 set_if_not_defined(FSO_VERSION_MINOR 3)
 set_if_not_defined(FSO_VERSION_BUILD 0)

@@ -35,15 +35,7 @@ ELSE()
    SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
 ENDIF()

-IF(IS_RISCV)
-	IF(IS_64BIT)
-		SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_riscv64")
-	ELSE()
-		SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_riscv32")
-	ENDIF()
-ELSEIF(IS_ARM64)
-    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_arm64")
-ELSEIF(IS_64BIT)
+IF(IS_64BIT)
 	# This is a 64-bit builds
    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
 ENDIF()
@@ -6,7 +6,7 @@ INCLUDE(voice_rec.cmake)

 ADD_LIBRARY(code STATIC ${source_files} ${VOICE_REC_FILES})

-target_compile_features(code PUBLIC cxx_std_17)
+target_compile_features(code PUBLIC cxx_std_11)

 if (MSVC)
 	target_compile_definitions(code PUBLIC "PDB_DEBUGGING=1")
@@ -20,17 +20,6 @@ TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${GENERATED_SOURCE_DIR}/code)

 if (FSO_BUILD_WITH_OPENGL)
 	target_link_libraries(code PUBLIC OpenGL)
-	if(FSO_BUILD_WITH_OPENGL_DEBUG)
-		add_definitions(-DFS_OPENGL_DEBUG)
-	endif()
-endif()
-
-if(FSO_BUILD_WITH_OPENXR)
-	add_definitions(-DFS_OPENXR)
-endif()
-
-if(FSO_BUILD_WITH_OPENXR_DEBUG AND FSO_BUILD_WITH_OPENXR)
-	add_definitions(-DFS_OPENXR_DEBUG)
 endif()

 TARGET_LINK_LIBRARIES(code PUBLIC openal)
@@ -52,15 +41,16 @@ TARGET_LINK_LIBRARIES(code PUBLIC compiler)

 target_link_libraries(code PUBLIC md5)

-if (FSO_BUILD_WITH_DISCORD)
-	target_link_libraries(code PUBLIC discord-rpc)
-	add_definitions(-DWITH_DISCORD)
-endif()
+target_link_libraries(code PUBLIC discord-rpc)

 target_link_libraries(code PUBLIC libRocket)

 target_link_libraries(code PUBLIC pcp)

+if (FSO_BUILD_WITH_VULKAN)
+	target_link_libraries(code PUBLIC vulkan-hpp)
+endif()
+
 target_link_libraries(code PUBLIC parsers)

 target_link_libraries(code PUBLIC mdns)
@@ -74,23 +64,14 @@ ENDIF(FSO_USE_SPEECH)

 TARGET_LINK_LIBRARIES(code PUBLIC jansson)

-target_link_libraries(code PUBLIC anl)
+target_link_libraries(code PUBLIC variant)

-target_link_libraries(code PUBLIC hidapi::hidapi)
+target_link_libraries(code PUBLIC any)
+
+target_link_libraries(code PUBLIC optional)

 target_link_libraries(code PUBLIC imgui)

-IF(FSO_BUILD_WITH_OPENXR)
-	target_link_libraries(code PUBLIC OpenXR::openxr_loader)
-	target_include_directories(code PUBLIC OpenXR::Headers)
-ENDIF()
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	# On Linux, we need to access X11 window data.
-	# On Windows, SDL already provides everything, so no need to do anything
-	find_package(X11)
-	target_link_libraries(code PUBLIC ${X11_LIBRARIES})
-ENDIF()
-
 # Headers for standalone "gui" on UNIX
 IF(UNIX)
 	TARGET_LINK_LIBRARIES(code PUBLIC ${MONGOOSE_LIBS})
@@ -113,16 +94,7 @@ if (FSO_BUILD_WITH_OPENGL)
 	target_compile_definitions(code PUBLIC WITH_OPENGL)
 endif()
 if (FSO_BUILD_WITH_VULKAN)
-	find_package(Vulkan REQUIRED)
-	if (Vulkan_FOUND)
-		target_compile_definitions(code PUBLIC WITH_VULKAN)
-		target_link_libraries(code PRIVATE Vulkan::Vulkan)
-
-		target_compile_definitions(code PUBLIC WITH_VULKAN VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VK_NO_PROTOTYPES)
-	else()
-		message(WARNING "FSO_BUILD_WITH_VULKAN was set, but the package was unable to be found. Forcing OFF.")
-		set(FSO_BUILD_WITH_VULKAN OFF CACHE BOOL "Enable compilation of the Vulkan renderer" FORCE)
-	endif()
+	target_compile_definitions(code PUBLIC WITH_VULKAN)
 endif()

 include(shaders.cmake)
@@ -140,4 +112,4 @@ set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCT[va
 set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN[variant=Debug] "NO")

 # Prevent GCC warnings in third-party BitOp... see GitHub #4366
-suppress_file_warnings(scripting/lua/bitop/bit.c)
+suppress_file_warnings(scripting/lua/bitop/bit.c)
@@ -47,7 +47,7 @@ ProgramInstance::ProgramInstance(const actions::Program* program) : _program(pro

 ProgramState ProgramInstance::step()
 {
-	if (!_locals.host.isValid()) {
+	if (!_locals.host.IsValid()) {
 		return ProgramState::Done;
 	}

@@ -122,9 +122,9 @@ class ExpressionBuilderVisitor : public ActionExpressionVisitor {
 	}
 	antlrcpp::Any visitVec3d_constructor(ActionExpressionParser::Vec3d_constructorContext* context) override
 	{
-		const auto xExpression = visit(context->expression(0)).as<std::shared_ptr<nodes::AbstractExpression>>();
-		const auto yExpression = visit(context->expression(1)).as<std::shared_ptr<nodes::AbstractExpression>>();
-		const auto zExpression = visit(context->expression(2)).as<std::shared_ptr<nodes::AbstractExpression>>();
+		auto xExpression = visit(context->expression(0)).as<std::shared_ptr<nodes::AbstractExpression>>();
+		auto yExpression = visit(context->expression(1)).as<std::shared_ptr<nodes::AbstractExpression>>();
+		auto zExpression = visit(context->expression(2)).as<std::shared_ptr<nodes::AbstractExpression>>();

 		auto expression = std::make_shared<nodes::VectorConstructorExpression>(context->L_PAREN()->getSymbol(),
 			xExpression,
@@ -2,7 +2,7 @@

 #include "globalincs/pstypes.h"

-#include <variant>
+#include <mpark/variant.hpp>

 namespace actions {
 namespace expression {
@@ -85,10 +85,10 @@ class Value {

 		if (currentType == expectedType) {
 			// No conversion necessary
-			return std::get<T>(m_value);
+			return mpark::get<T>(m_value);
 		}

-		return std::visit(detail::implicit_conversion<T>{}, m_value);
+		return mpark::visit(detail::implicit_conversion<T>{}, m_value);
 	}

 	friend bool operator==(const Value& lhs, const Value& rhs);
@@ -97,7 +97,7 @@ class Value {
 	friend std::ostream& operator<<(std::ostream& os, const Value& value);

  private:
-	std::variant<std::monostate, int, float, vec3d, SCP_string> m_value;
+	mpark::variant<mpark::monostate, int, float, vec3d, SCP_string> m_value;
 };

 } // namespace expression
@@ -26,8 +26,10 @@ ActionResult MoveToSubmodel::execute(ProgramLocals& locals) const
 	// The calling code should ensure that this never happens
 	Assertion(locals.hostSubobject >= 0, "Did not have a valid host subobject.");

-	auto pmi = object_get_model_instance(locals.host.objp());
-	Assertion(pmi != nullptr, "Model instances are required if a host subobject is specified.");
+	auto instance = object_get_model_instance(locals.host.objp);
+	Assertion(instance != -1, "Model instances are required if a host subobject is specified.");
+
+	auto pmi = model_get_instance(instance);
 	auto pm = model_get(pmi->model_num);

 	const auto destinationSubObject = m_subObjectExpression.execute(locals.variables);
@@ -55,7 +57,7 @@ ActionResult MoveToSubmodel::execute(ProgramLocals& locals) const

 	// We need to do a linear search for the right subobject
 	for (int i = 0; i < pm->n_models; ++i) {
-		const auto& submodel = pm->submodel[i];
+		const auto submodel = pm->submodel[i];

 		if (subsystem_stricmp(destinationSubObject.c_str(), submodel.name) == 0) {
 			// Found something!
@@ -3,8 +3,6 @@

 #include "math/vecmat.h"
 #include "parse/parselo.h"
-#include "particle/hosts/EffectHostObject.h"
-#include "particle/ParticleManager.h"
 #include "ship/ship.h"

 #include <utility>
@@ -39,8 +37,10 @@ ActionResult ParticleEffectAction::execute(ProgramLocals& locals) const
 	vec3d local_pos;
 	matrix local_orient;
 	if (locals.hostSubobject != -1) {
-		auto pmi = object_get_model_instance(locals.host.objp());
-		Assertion(pmi != nullptr, "Model instances are required if a host subobject is specified.");
+		auto instance = object_get_model_instance(locals.host.objp);
+		Assertion(instance != -1, "Model instances are required if a host subobject is specified.");
+
+		auto pmi = model_get_instance(instance);
 		auto pm = model_get(pmi->model_num);

 		model_instance_local_to_global_point_orient(&local_pos,
@@ -58,11 +58,11 @@ ActionResult ParticleEffectAction::execute(ProgramLocals& locals) const
 	local_pos += locals.variables.getValue({"locals", "position"}).getVector();

 	auto direction = locals.variables.getValue({"locals", "direction"}).getVector();
-	matrix orientation;
-	vm_vector_2_matrix_norm(&orientation, &direction);	// direction is normalized in SetDirectionAction::execute

-	source->setHost(make_unique<EffectHostObject>(locals.host.objp(), local_pos, orientation, true));
-	source->finishCreation();
+	source.moveToObject(locals.host.objp, &local_pos);
+	source.setOrientationFromNormalizedVec(&direction, true);
+
+	source.finish();

 	return ActionResult::Finished;
 }
@@ -2,6 +2,7 @@

 #include "actions/Action.h"
 #include "actions/expression/ActionExpression.h"
+#include "particle/ParticleManager.h"

 namespace actions {
 namespace types {
@@ -26,8 +26,10 @@ ActionResult PlaySoundAction::execute(ProgramLocals& locals) const
 	vec3d local_pos;
 	matrix local_orient;
 	if (locals.hostSubobject != -1) {
-		auto pmi = object_get_model_instance(locals.host.objp());
-		Assertion(pmi != nullptr, "Model instances are required if a host subobject is specified.");
+		auto instance = object_get_model_instance(locals.host.objp);
+		Assertion(instance != -1, "Model instances are required if a host subobject is specified.");
+
+		auto pmi = model_get_instance(instance);
 		auto pm = model_get(pmi->model_num);

 		model_instance_local_to_global_point_orient(&local_pos,
@@ -45,8 +47,8 @@ ActionResult PlaySoundAction::execute(ProgramLocals& locals) const
 	local_pos += locals.variables.getValue({"locals", "position"}).getVector();

 	vec3d global_pos;
-	vm_vec_unrotate(&global_pos, &local_pos, &locals.host.objp()->orient);
-	global_pos += locals.host.objp()->pos;
+	vm_vec_unrotate(&global_pos, &local_pos, &locals.host.objp->orient);
+	global_pos += locals.host.objp->pos;

 	const auto soundId = gamesnd_get_by_name(m_soundIdExpression.execute(locals.variables).c_str());

@@ -34,13 +34,7 @@ typedef struct ai_flag_name {
 	char flag_name[TOKEN_LENGTH];
 } ai_flag_name;

-typedef struct ai_flag_description {
-	AI::AI_Flags flag;
-	const char *flag_desc;
-} ai_flag_description;
-
 extern ai_flag_name Ai_flag_names[];
-extern ai_flag_description Ai_flag_descriptions[];
 extern const int Num_ai_flag_names;

 //	dock_orient_and_approach() modes.
@@ -56,6 +50,12 @@ extern const int Num_ai_flag_names;
 #define	AIDO_DOCK_NOW	2		//	Immediately move into dock position.  For ships that start mission docked.
 #define	AIDO_UNDOCK		3		//	Set goal of undocking with object.

+//	Submodes for seeking safety.
+#define	AISS_1	41				//	Pick a spot to fly to.
+#define	AISS_2	42				//	Flying to spot.
+#define	AISS_3	43				//  Gotten near spot, fly about there.
+#define	AISS_1a	44				//	Pick a new nearby spot because we are endangered, then go to AISS_2
+
 //	Flags to ai_turn_towards_vector().
 #define	AITTV_FAST					(1<<0)	//	Turn fast, not slowed down based on skill level.
 #define AITTV_VIA_SEXP				(1<<1)	//	Goober5000 - via sexp
@@ -87,7 +87,7 @@ extern const int Num_ai_flag_names;
 #define	AIM_BAY_DEPART			18		//  Departing to a fighter bay, following path to do so
 #define	AIM_SENTRYGUN			19		//  AI mode for sentry guns only (floating turrets)
 #define	AIM_WARP_OUT			20		//	Commence warp out sequence.  Point in legal direction.  Then call John's code.
-#define AIM_FLY_TO_SHIP			21		//  Rendezvous with a ship.  Like stay-near, but non-perpetual.
+#define AIM_FLY_TO_SHIP			21		//  [Kazan] Fly to a ship, doesn't matter if it's hostile or friendly -- for Autopilot usage
 #define AIM_LUA					22		//  Generic Lua-based AI mode

 #define	MAX_AI_BEHAVIORS		23		//	Number of AIM_xxxx types
@@ -96,7 +96,6 @@ extern const int Num_ai_flag_names;
 #define	MAX_ENEMY_DISTANCE	2500.0f		//	Maximum distance from which a ship will pursue an enemy.

 #define MAX_AI_GOALS	5
-#define AI_ACTIVE_GOAL_NONE		-1
 #define	AI_ACTIVE_GOAL_DYNAMIC	999

 typedef struct ai_class {
@@ -181,12 +180,6 @@ typedef struct ai_class {
 #define	AIS_UNDOCK_3	33
 #define	AIS_UNDOCK_4	34

-//	Submodes for seeking safety.
-#define	AISS_1	41				//	Pick a spot to fly to.
-#define	AISS_2	42				//	Flying to spot.
-#define	AISS_3	43				//  Gotten near spot, fly about there.
-#define	AISS_1a	44				//	Pick a new nearby spot because we are endangered, then go to AISS_2.  (Not implemented.)
-
 //	Submodes for Guard behavior
 #define	AIS_GUARD_PATROL		101
 #define	AIS_GUARD_ATTACK		102
@@ -241,6 +234,7 @@ typedef struct ai_info {
 	flagset<AI::AI_Flags> ai_flags;				//	Special flags for AI behavior.
 	int		shipnum;					// Ship using this slot, -1 means none.

+	int		behavior;				//	AI behavior; vestigial field from early development of FS1
 	int		mode;
 	int		previous_mode;
 	int		mode_time;				//	timestamp at which current mode elapses.
@@ -277,8 +271,8 @@ typedef struct ai_info {
 	int		ai_class;				//	Class.  Might be override of default.

 	//	Probably become obsolete, to be replaced by path_start, path_cur, etc.
-	int		wp_list_index;			// index of waypoint list being followed
-	int		wp_index;				// index of waypoint in list
+	waypoint_list	*wp_list;		// waypoint list being followed
+	size_t			 wp_index;		// waypoint index in list
 	int		wp_flags;				//	waypoint flags, see WPF_xxxx
 	int		waypoint_speed_cap;		// -1 no cap, otherwise cap - changed to int by Goober5000

@@ -308,7 +302,6 @@ typedef struct ai_info {
 	fix		submode_start_time;	// time at which we entered the current submode
 	int		submode_parm0;			//	parameter specific to current submode
 	int		submode_parm1;			//	SUSHI: Another optional parameter
-	float	submode_float0;			//	Goober5000: a float parameter
 	fix		next_predict_pos_time;			//	Next time to predict position.

 	int		next_dynamic_path_check_time;	//ETP: Time of next path check in ai_new_maybe_reposition_attack_subsys
@@ -318,7 +311,7 @@ typedef struct ai_info {
 	//Unlike the predicted position stuff, also takes into account velocity
 	//Only used against small ships
 	fix		next_aim_pos_time;
-	vec3d	last_aim_enemy_pos;		// Normally this is the position of the enemy a turret is targeting but in the F3 Lab, this is used to pass raw target coordinates to the turret firing methods. 
+	vec3d	last_aim_enemy_pos;
 	vec3d	last_aim_enemy_vel;

 	ai_goal	goals[MAX_AI_GOALS];
@@ -330,7 +323,7 @@ typedef struct ai_info {
 	float	time_enemy_near;					//	SUSHI: amount of time enemy continuously "near" the player
 	fix		last_attack_time;					//	Missiontime of last time this ship attacked its enemy.
 	fix		last_hit_time;						//	Missiontime of last time this ship was hit by anyone.
-	int		danger_shield_quadrant;				//	Shield section AI will prefer to prioritize for recharging, it if possible.
+	int		last_hit_quadrant;				//	Shield section of last hit.
 	fix		last_hit_target_time;			//	Missiontime of last time this ship successfully hit target.
 	int		hitter_objnum;						//	Object index of ship that hit this ship last time.
 	int		hitter_signature;					//	Signature of hitter.  Prevents stupidity if hitter gets killed.
@@ -374,6 +367,11 @@ typedef struct ai_info {
 	float	ai_turret_max_aim_update_delay;
 	flagset<AI::Profile_Flags> ai_profile_flags;	//Holds AI_Profiles flags (possibly overriden by AI class) that actually apply to AI

+
+	union {
+	float		stay_near_distance;				//	Distance to stay within for AIM_STAY_NEAR mode.
+	};
+
 	ship_subsys*	targeted_subsys;			// Targeted subobject on current target.  NULL if none;
 	ship_subsys*	last_subsys_target;		// last known subsystem target
 	int				targeted_subsys_parent;	//	Parent objnum of subobject, not necessarily targeted
@@ -485,7 +483,7 @@ typedef struct {
 #define SUBSYS_PATH_DIST	500.0f

 // Friendly damage defines
-#define MAX_BURST_DAMAGE	20.0f		// max damage that can be done in BURST_DURATION
+#define MAX_BURST_DAMAGE	20		// max damage that can be done in BURST_DURATION
 #define BURST_DURATION		500	// decay time over which Player->damage_this_burst falls from MAX_BURST_DAMAGE to 0

 extern int Mission_all_attack;	//	!0 means all teams attack all teams.
@@ -534,11 +532,11 @@ extern void ai_ignore_wing(object *ignorer, int wingnum);
 extern void ai_dock_with_object(object *docker, int docker_index, object *dockee, int dockee_index, int dock_type);
 extern void ai_stay_still(object *still_objp, vec3d *view_pos);
 extern void ai_do_default_behavior(object *obj);
-extern void ai_start_waypoints(object *objp, int wl_index, int wp_flags, int start_index, bool force = false);
-extern void ai_ship_hit(object *objp_ship, object *hit_objp, const vec3d *hit_normal);
+extern void ai_start_waypoints(object *objp, waypoint_list *wp_list, int wp_flags);
+extern void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal);
 extern void ai_ship_destroy(int shipnum);
 extern vec3d ai_get_acc_limit(vec3d* vel_limit, const object* objp);
-extern void ai_turn_towards_vector(const vec3d *dest, object *objp, const vec3d *slide_vec, const vec3d *rel_pos, float bank_override, int flags, const vec3d *rvec = nullptr, const vec3d* turnrate_mod = nullptr);
+extern void ai_turn_towards_vector(vec3d *dest, object *objp, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = nullptr, vec3d* turnrate_mod = nullptr);
 extern void init_ai_object(int objnum);
 extern void ai_init(void);				//	Call this one to parse ai.tbl.
 extern void ai_level_init(void);		//	Call before each level to reset AI
@@ -561,7 +559,7 @@ extern void ai_attack_wing(object *attacker, int wingnum);
 extern void ai_deathroll_start(object *ship_obj);
 extern int set_target_objnum(ai_info *aip, int objnum);
 extern void ai_form_on_wing(object *objp, object *goal_objp);
-extern void ai_do_stay_near(object *objp, object *other_obj, float dist, int additional_data);
+extern void ai_do_stay_near(object *objp, object *other_obj, float dist);
 extern ship_subsys *set_targeted_subsys(ai_info *aip, ship_subsys *new_subsys, int parent_objnum);
 extern void ai_rearm_repair( object *objp, int docker_index, object *goal_objp, int dockee_index );
 extern void ai_add_rearm_goal( object *requester_objp, object *support_objp );
@@ -590,20 +588,17 @@ extern int ai_fire_primary_weapon(object *objp);	//changed to return weather it
 extern int ai_fire_secondary_weapon(object *objp);
 extern float ai_get_weapon_dist(ship_weapon *swp);
 extern void turn_towards_point(object *objp, vec3d *point, vec3d *slide_vec, float bank_override, matrix* target_orient = nullptr, int flags = 0);
-extern bool ai_willing_to_afterburn_hard(ai_info* aip);
-extern void ai_afterburn_hard(object* objp, ai_info* aip);
 extern int ai_maybe_fire_afterburner(object *objp, ai_info *aip);
 extern void set_predicted_enemy_pos(vec3d *predicted_enemy_pos, object *pobjp, vec3d *enemy_pos, vec3d *enemy_vel, ai_info *aip);

 extern int is_instructor(object *objp);
 extern int find_enemy(int objnum, float range, int max_attackers, int ship_info_index = -1);

-float ai_get_weapon_speed(const ship_weapon *swp);
-void set_predicted_enemy_pos_turret(vec3d *predicted_enemy_pos, const vec3d *gun_pos, const object *pobjp, const vec3d *enemy_pos, const vec3d *enemy_vel, float weapon_speed, float time_enemy_in_range);
+float ai_get_weapon_speed(ship_weapon *swp);
+void set_predicted_enemy_pos_turret(vec3d *predicted_enemy_pos, vec3d *gun_pos, object *pobjp, vec3d *enemy_pos, vec3d *enemy_vel, float weapon_speed, float time_enemy_in_range);

 // function to change rearm status for ai ships (called from sexpression code)
-extern void ai_set_good_rearm_time( int team, int time );
-extern void ai_set_bad_rearm_time(int team, int time);
+extern void ai_set_rearm_status( int team, int new_status );
 extern void ai_good_secondary_time( int team, int weapon_index, int num_weapons, const char *shipname );

 extern void ai_do_objects_docked_stuff(object *docker, int docker_point, object *dockee, int dockee_point, bool update_clients = true);
@@ -622,6 +617,10 @@ int get_nearest_objnum(int objnum, int enemy_team_mask, int enemy_wing, float ra
 // moved to header file by Goober5000
 void ai_announce_ship_dying(object *dying_objp);

+// added by kazan
+void ai_start_fly_to_ship(object *objp, int shipnum);
+void ai_fly_to_ship();
+
 //Moved declaration here for player ship -WMC
 void ai_process_subobjects(int objnum);

@@ -636,6 +635,6 @@ void do_random_sidethrust(ai_info *aip, ship_info *sip);
 void ai_formation_object_recalculate_slotnums(int form_objnum, int exiting_objnum = -1);


-bool test_line_of_sight(const vec3d* from, const vec3d* to, SCP_unordered_set<int>&& excluded_object_ids = {}, float threshold = 10.0f, bool test_for_shields = false, bool test_for_hull = true, float* first_intersect_dist = nullptr, object** first_intersect_obj = nullptr);
+bool test_line_of_sight(vec3d* from, vec3d* to, std::unordered_set<const object*>&& excluded_objects = {}, float threshold = 10.0f, bool test_for_shields = false, bool test_for_hull = true, float* first_intersect_dist = nullptr, object** first_intersect_obj = nullptr);

 #endif
@@ -32,8 +32,6 @@ namespace AI {
 		Unload_primaries,			//	Fire primaries as fast as possible!
 		Trying_unsuccessfully_to_warp,	// Trying to warp, but can't warp at the moment
 		Free_afterburner_use,		// Use afterburners while following waypoints or flying towards objects
-		Waypoints_no_formation,		// wont get into formation when running waypoints as part of a wing
-

 		NUM_VALUES
 	};
@@ -43,13 +41,11 @@ namespace AI {
 		Dockee_index_valid,	// when set, index field for dockee is valid
 		Goal_on_hold,		// when set, this goal cannot currently be satisfied, although it could be in the future
 		Subsys_needs_fixup,	// when set, the subsystem index (for a destroy subsystem goal) is invalid and must be gotten from the subsys name stored in docker.name field!!
-		Goal_override,		// paired with ai_goal_type::DYNAMIC to mean this goal overrides any other goal
+		Goal_override,		// paired with AIG_TYPE_DYNAMIC to mean this goal overrides any other goal
 		Purge,				// purge this goal next time we process
 		Goals_purged,		// this goal has already caused other goals to get purged
 		Depart_sound_played,// Goober5000 - replacement for AL's hack ;)
-		Target_own_team,	// this attack goal is allowed to target friendlies
-		Afterburn_hard,		// afterburn as hard as possible to the goal
-		Waypoints_in_reverse,	// decrement instead of increment
+		Target_own_team,

 		NUM_VALUES
 	};
@@ -101,10 +97,6 @@ namespace AI {
        Fix_heat_seeker_stealth_bug,
        Fix_linked_primary_bug,
 		Fix_ramming_stationary_targets_bug,
-		Fix_avoid_shockwave_bugs,   // a) waiting until a homing weapon actually homes before evading;
-		                            // b) picking the correct expected impact position for capships;
-		                            // c) not clearing shockwave_object for ships;
-		                            // d) checking the explosion damage of the correct ship
        Force_beam_turret_fov,
 		Free_afterburner_use,
        Glide_decay_requires_thrust,
@@ -129,7 +121,7 @@ namespace AI {
        Smart_shield_management,
        Smart_subsystem_targeting_for_turrets,
        Strict_turret_tagged_only_targeting,
-		Support_dont_add_primaries, //Prevents support ship from equipping new primary as requested in https://scp.indiegames.us/mantis/view.php?id=3198
+		Support_dont_add_primaries, //Prevents support ship from equipping new primary as requested in http://scp.indiegames.us/mantis/view.php?id=3198
        Turrets_ignore_target_radius,
        Use_actual_primary_range,
        Use_subsystem_path_point_radii,
@@ -138,14 +130,12 @@ namespace AI {
        Use_only_single_fov_for_turrets,
        No_turning_directional_bias,
 		Use_axial_turnrate_differences,
-		All_nonshielded_ships_can_manage_ets,
-		Fightercraft_nonshielded_ships_can_manage_ets,
-		Ships_playing_dead_dont_manage_ets,
-		Better_combat_collision_avoidance,
-		Better_guard_collision_avoidance,
+		all_nonshielded_ships_can_manage_ets,
+		fightercraft_nonshielded_ships_can_manage_ets,
+		Better_collision_avoidance,
 		Require_exact_los,
 		Improved_missile_avoidance,
-		Unify_usage_countermeasure_firechance,
+		Friendlies_use_countermeasure_firechance,
 		Improved_subsystem_attack_pathing,
 		Fixed_ship_weapon_collision,
 		No_shield_damage_from_ship_collisions,
@@ -160,24 +150,6 @@ namespace AI {
 		Fixed_removing_play_dead_order,
 		Disable_bay_emerge_timeout,
 		Adjusted_AI_class_autoscale,
-		Carry_shield_difficulty_scaling_bug,
-		Whackable_debris,
-		Whackable_asteroids,
-		Dynamic_goals_afterburn_hard,
-		Player_orders_afterburn_hard,
-		Hudsquadmsg_tactical_disarm_disable,
-		Align_to_target_when_guarding_still,
-		Debris_respects_big_damage,
-		Dont_limit_change_in_speed_due_to_physics_whack,
-		Guards_ignore_protected_attackers,
-		Standard_strafe_used_more,
-		Unify_usage_ai_shield_manage_delay,
-		Fix_AI_shield_management_bug,
-		AI_balances_shields_when_attacked,
-		Disable_ai_transferring_energy,
-		Freespace_1_missile_behavior,
-		ETS_uses_power_output,
-		ETS_energy_same_regardless_of_system_presence,

 		NUM_VALUES
 	};
@@ -184,14 +184,6 @@ void parse_ai_profiles_tbl(const char *filename)
 				if (optional_string("$Max Beam Friendly Fire Damage:"))
 					parse_float_list(profile->beam_friendly_damage_cap, NUM_SKILL_LEVELS);

-				if (optional_string("$Max Weapon Friendly Fire Damage:")) {
-					parse_float_list(profile->weapon_friendly_damage_cap, NUM_SKILL_LEVELS);
-				}
-					
-				if (optional_string("$Max Weapon Self Damage:")) {
-					parse_float_list(profile->weapon_self_damage_cap, NUM_SKILL_LEVELS);
-				}
-
 				if (optional_string("$Player Countermeasure Life Scale:"))
 					parse_float_list(profile->cmeasure_life_scale, NUM_SKILL_LEVELS);

@@ -231,9 +223,6 @@ void parse_ai_profiles_tbl(const char *filename)
 				if (optional_string("$Player Subsys Damage Factor:") || optional_string("$AI Damage Reduction to Player Subsys:"))
 					parse_float_list(profile->subsys_damage_scale, NUM_SKILL_LEVELS);

-				if (optional_string("$Player Damage Inflicted Factor:"))
-					parse_float_list(profile->player_damage_inflicted_scale, NUM_SKILL_LEVELS);
-
 				// represented in fractions of F1_0
 				if (optional_string("$Predict Position Delay:"))
 				{
@@ -266,7 +255,7 @@ void parse_ai_profiles_tbl(const char *filename)

 				if (optional_string("$Glide Attack Percent:")) {
 					parse_float_list(profile->glide_attack_percent, NUM_SKILL_LEVELS);
-					//Percent is nice for modders, but here in the code we want it between 0 and 1.0
+					//Percent is nice for modders, but here in the code we want it betwwen 0 and 1.0
 					//While we're at it, verify the range
 					for (i = 0; i < NUM_SKILL_LEVELS; i++) {
 						if (profile->glide_attack_percent[i] < 0.0f || profile->glide_attack_percent[i] > 100.0f) {
@@ -279,7 +268,7 @@ void parse_ai_profiles_tbl(const char *filename)

 				if (optional_string("$Circle Strafe Percent:")) {
 					parse_float_list(profile->circle_strafe_percent, NUM_SKILL_LEVELS);
-					//Percent is nice for modders, but here in the code we want it between 0 and 1.0
+					//Percent is nice for modders, but here in the code we want it betwwen 0 and 1.0
 					//While we're at it, verify the range
 					for (i = 0; i < NUM_SKILL_LEVELS; i++) {
 						if (profile->circle_strafe_percent[i] < 0.0f || profile->circle_strafe_percent[i] > 100.0f) {
@@ -292,7 +281,7 @@ void parse_ai_profiles_tbl(const char *filename)

 				if (optional_string("$Glide Strafe Percent:")) {
 					parse_float_list(profile->glide_strafe_percent, NUM_SKILL_LEVELS);
-					//Percent is nice for modders, but here in the code we want it between 0 and 1.0
+					//Percent is nice for modders, but here in the code we want it betwwen 0 and 1.0
 					//While we're at it, verify the range
 					for (i = 0; i < NUM_SKILL_LEVELS; i++) {
 						if (profile->glide_strafe_percent[i] < 0.0f || profile->glide_strafe_percent[i] > 100.0f) {
@@ -305,7 +294,7 @@ void parse_ai_profiles_tbl(const char *filename)

 				if (optional_string("$Random Sidethrust Percent:")) {
 					parse_float_list(profile->random_sidethrust_percent, NUM_SKILL_LEVELS);
-					//Percent is nice for modders, but here in the code we want it between 0 and 1.0
+					//Percent is nice for modders, but here in the code we want it betwwen 0 and 1.0
 					//While we're at it, verify the range
 					for (i = 0; i < NUM_SKILL_LEVELS; i++) {
 						if (profile->random_sidethrust_percent[i] < 0.0f || profile->random_sidethrust_percent[i] > 100.0f) {
@@ -377,7 +366,7 @@ void parse_ai_profiles_tbl(const char *filename)
 				}

 				if (optional_string("$Detail Distance Multiplier:"))
-					parse_float_list(profile->detail_distance_mult, MAX_DETAIL_VALUE + 1);
+					parse_float_list(profile->detail_distance_mult, MAX_DETAIL_LEVEL + 1);

 				set_flag(profile, "$big ships can attack beam turrets on untargeted ships:", AI::Profile_Flags::Big_ships_can_attack_beam_turrets_on_untargeted_ships);

@@ -479,20 +468,10 @@ void parse_ai_profiles_tbl(const char *filename)

 				set_flag(profile, "$firing requires exact los:", AI::Profile_Flags::Require_exact_los);

-				if (optional_string("$exact los minimum detection radius:")) {
-					stuff_float(&profile->los_min_detection_radius);
-				}
-
 				set_flag(profile, "$fighterbay arrivals use carrier orientation:", AI::Profile_Flags::Fighterbay_arrivals_use_carrier_orient);

 				set_flag(profile, "$fighterbay departures use carrier orientation:", AI::Profile_Flags::Fighterbay_departures_use_carrier_orient);

-				set_flag(profile, "$debris damage respects 'big damage' flag:", AI::Profile_Flags::Debris_respects_big_damage);
-
-				set_flag(profile, "$don't limit change in speed due to physics whack:", AI::Profile_Flags::Dont_limit_change_in_speed_due_to_physics_whack);
-
-				set_flag(profile, "$guards ignore protected attackers:", AI::Profile_Flags::Guards_ignore_protected_attackers);
-
 				if (optional_string("$ai path mode:"))
 				{
 					stuff_string(buf, F_NAME, NAME_LENGTH);
@@ -567,40 +546,22 @@ void parse_ai_profiles_tbl(const char *filename)
 					mprintf(("Warning: \"$ships with no shields can manage ETS\" flag is deprecated in favor of \"$any ship with no shields can manage ETS\"\n"));
 					bool temp;
 					stuff_boolean(&temp);
-                    profile->flags.set(AI::Profile_Flags::All_nonshielded_ships_can_manage_ets, temp);
+                    profile->flags.set(AI::Profile_Flags::all_nonshielded_ships_can_manage_ets, temp);
 				}

-				// ----------
-
-				set_flag(profile, "$no directional bias for missile and ship turning:", AI::Profile_Flags::No_turning_directional_bias);
+                set_flag(profile, "$no directional bias for missile and ship turning:", AI::Profile_Flags::No_turning_directional_bias);

 				set_flag(profile, "$respect ship axial turnrate differences:", AI::Profile_Flags::Use_axial_turnrate_differences);

-				set_flag(profile, "$any ship with no shields can manage ETS:", AI::Profile_Flags::All_nonshielded_ships_can_manage_ets);
+				set_flag(profile, "$any ship with no shields can manage ETS:", AI::Profile_Flags::all_nonshielded_ships_can_manage_ets);

-				set_flag(profile, "$fighters/bombers with no shields can manage ETS:", AI::Profile_Flags::Fightercraft_nonshielded_ships_can_manage_ets);
+				set_flag(profile, "$fighters/bombers with no shields can manage ETS:", AI::Profile_Flags::fightercraft_nonshielded_ships_can_manage_ets);

-				set_flag(profile, "$ships playing dead don't manage ETS:", AI::Profile_Flags::Ships_playing_dead_dont_manage_ets);
-
-				set_flag(profile, "$better combat collision avoidance for fightercraft:", AI::Profile_Flags::Better_combat_collision_avoidance);
-
-				if (optional_string("+combat collision avoidance aggression for fightercraft:")) {
-					stuff_float(&profile->better_collision_avoid_aggression_combat);
-				}
-
-				set_flag(profile, "$better guard collision avoidance for fightercraft:", AI::Profile_Flags::Better_guard_collision_avoidance);
-
-				if (optional_string("+guard collision avoidance aggression for fightercraft:")) {
-					stuff_float(&profile->better_collision_avoid_aggression_guard);
-				}
+				set_flag(profile, "$better combat collision avoidance for fightercraft:", AI::Profile_Flags::Better_collision_avoidance);

 				set_flag(profile, "$improved missile avoidance for fightercraft:", AI::Profile_Flags::Improved_missile_avoidance);

-				if (optional_string_either("$friendly ships use AI profile countermeasure chance:", "$unify usage of AI profile countermeasure chance:", true) >= 0) {
-					bool val;
-					stuff_boolean(&val);
-					profile->flags.set(AI::Profile_Flags::Unify_usage_countermeasure_firechance, val);
-				}
+				set_flag(profile, "$friendly ships use AI profile countermeasure chance:", AI::Profile_Flags::Friendlies_use_countermeasure_firechance);

 				set_flag(profile, "$improved subsystem attack pathing:", AI::Profile_Flags::Improved_subsystem_attack_pathing);

@@ -649,70 +610,6 @@ void parse_ai_profiles_tbl(const char *filename)

 				set_flag(profile, "$use adjusted AI class autoscale:", AI::Profile_Flags::Adjusted_AI_class_autoscale);

-				set_flag(profile, "$carry shield difficulty scaling bug:", AI::Profile_Flags::Carry_shield_difficulty_scaling_bug);
-
-				set_flag(profile, "$debris affected by physics whacks:", AI::Profile_Flags::Whackable_debris);
-
-				set_flag(profile, "$asteroids affected by physics whacks:", AI::Profile_Flags::Whackable_asteroids);
-
-				set_flag(profile, "$dynamic goals afterburn hard:", AI::Profile_Flags::Dynamic_goals_afterburn_hard);
-
-				set_flag(profile, "$player orders afterburn hard:", AI::Profile_Flags::Player_orders_afterburn_hard);
-
-				set_flag(profile, "$hud squad messages use tactical disarm/disable:", AI::Profile_Flags::Hudsquadmsg_tactical_disarm_disable);
-
-				set_flag(profile, "$align to target when guarding stationary ship:", AI::Profile_Flags::Align_to_target_when_guarding_still);
-
-				if (optional_string("$rotation factor multiplier for player collisions:")) {
-					stuff_float(&profile->rot_fac_multiplier_ply_collisions);
-				}
-
-				set_flag(profile, "$fix avoid-shockwave bugs:", AI::Profile_Flags::Fix_avoid_shockwave_bugs);
-
-				set_flag(profile, "$standard strafe used more:", AI::Profile_Flags::Standard_strafe_used_more);
-
-				if (optional_string("$standard strafe triggers under this speed:")) {
-					stuff_float(&profile->standard_strafe_when_below_speed);
-				}
-
-				if (optional_string("$strafe distance from target bounding box:")) {
-					stuff_float(&profile->strafe_retreat_box_dist);
-				}
-
-				if (optional_string("$strafe stops after time unhit:")) {
-					stuff_float(&profile->strafe_max_unhit_time);
-				}
-
-				if (optional_string("$guard uses big-orbit for target radius above:")) {
-					stuff_float(&profile->guard_big_orbit_above_target_radius);
-				}
-
-				if (optional_string("$guard with big-orbit uses max speed percent:")) {
-					float max_percent;
-					stuff_float(&max_percent);
-					if (max_percent > 0.0f && max_percent <= 1.0f) {
-						profile->guard_big_orbit_max_speed_percent = max_percent;
-					} else {
-						mprintf(("Warning: \"$guard with big-orbit uses max speed percent:\" should be > 0 and <= 1 (read %f). Value will not be used.\n", max_percent));
-					}
-				}
-
-				set_flag(profile, "$unify usage of AI Shield Manage Delay:", AI::Profile_Flags::Unify_usage_ai_shield_manage_delay);
-
-				set_flag(profile, "$fix AI shield management bug:", AI::Profile_Flags::Fix_AI_shield_management_bug);
-
-				set_flag(profile, "$AI balances shields instead of directs when attacked:", AI::Profile_Flags::AI_balances_shields_when_attacked);
-
-				set_flag(profile, "$disable AI transferring energy:", AI::Profile_Flags::Disable_ai_transferring_energy);
-
-				set_flag(profile, "$enable freespace 1 style missile behavior:", AI::Profile_Flags::Freespace_1_missile_behavior);
-
-				set_flag(profile, "$ETS uses ship class power output:", AI::Profile_Flags::ETS_uses_power_output);
-
-				set_flag(profile, "$ETS energy same regardless of system presence:", AI::Profile_Flags::ETS_energy_same_regardless_of_system_presence);
-
-
-				// end of options ----------------------------------------

 				// if we've been through once already and are at the same place, force a move
 				if (saved_Mp && (saved_Mp == Mp))
@@ -720,7 +617,7 @@ void parse_ai_profiles_tbl(const char *filename)
 					char tmp[60];
 					memset(tmp, 0, 60);
 					strncpy(tmp, Mp, 59);
-					mprintf(("WARNING: Unrecognized parameter in %s: %s\n", filename, tmp));
+					mprintf(("WARNING: Unrecognized parameter in ai_profiles: %s\n", tmp));

 					Mp++;
 				}
@@ -755,21 +652,12 @@ void ai_profiles_init()
 	// init retail entry first
 	parse_ai_profiles_tbl(NULL);

-	// Allow mission_profiles.tbl to be a alias of ai_profiles.tbl, but only load one or the other.
-	// mission_profiles.tbl would be newer so assume intended, but print to the log to be sure - Mjn
-	char filename[MAX_FILENAME_LEN] = "ai_profiles.tbl";
-	if (cf_exists_full("mission_profiles.tbl", CF_TYPE_TABLES)) {
-		mprintf(("mission_profiles.tbl was found! Using that instead of ai_profiles.tbl...\n"));
-		strcpy_s(filename, "mission_profiles.tbl");
-	}
-
 	// now parse the supplied table (if any)
-	if (cf_exists_full(filename, CF_TYPE_TABLES))
-		parse_ai_profiles_tbl(filename);
+	if (cf_exists_full("ai_profiles.tbl", CF_TYPE_TABLES))
+		parse_ai_profiles_tbl("ai_profiles.tbl");

 	// parse any modular tables
 	parse_modular_table("*-aip.tbm", parse_ai_profiles_tbl);
-	parse_modular_table("*-msp.tbm", parse_ai_profiles_tbl);

 	// set default if specified
 	temp = ai_profile_lookup(Default_profile_name);
@@ -794,7 +682,6 @@ void ai_profile_t::reset()

    flags.reset();

-    los_min_detection_radius = 10.0f;
    ai_path_mode = AI_PATH_MODE_NORMAL;
 	subsystem_path_radii = 0;
    bay_arrive_speed_mult = 1.0f;
@@ -802,17 +689,6 @@ void ai_profile_t::reset()
 	second_order_lead_predict_factor = 0;
 	ai_range_aware_secondary_select_mode = AI_RANGE_AWARE_SEC_SEL_MODE_RETAIL;
 	turret_target_recheck_time = 2000.0f;
-	rot_fac_multiplier_ply_collisions = 0.0f;
-
-	better_collision_avoid_aggression_combat = 3.5f;
-	better_collision_avoid_aggression_guard = 3.5f;
-
-	standard_strafe_when_below_speed = 3.0f;
-	strafe_retreat_box_dist = 300.0f;
-	strafe_max_unhit_time = 20.0f;
-
-	guard_big_orbit_above_target_radius = 500.0f;
-	guard_big_orbit_max_speed_percent = 1.0f;

    for (int i = 0; i < NUM_SKILL_LEVELS; ++i) {
        max_incoming_asteroids[i] = 0;
@@ -835,12 +711,9 @@ void ai_profile_t::reset()
        shield_energy_scale[i] = 0;
        afterburner_recharge_scale[i] = 0;
        player_damage_scale[i] = 0;
-        player_damage_inflicted_scale[i] = 0;

        subsys_damage_scale[i] = 0;
-        beam_friendly_damage_cap[i] = -1.f;
-        weapon_friendly_damage_cap[i] = -1.f;
-        weapon_self_damage_cap[i] = -1.f;
+        beam_friendly_damage_cap[i] = 0;
        turn_time_scale[i] = 0;
        glide_attack_percent[i] = 0;
        circle_strafe_percent[i] = 0;
@@ -871,7 +744,7 @@ void ai_profile_t::reset()
        player_autoaim_fov[i] = 0;
    }

-    for (int i = 0; i <= MAX_DETAIL_VALUE; ++i) {
+    for (int i = 0; i <= MAX_DETAIL_LEVEL; ++i) {
        detail_distance_mult[i] = 0;
    }

@@ -887,7 +760,7 @@ void ai_profile_t::reset()
 		flags.set(AI::Profile_Flags::Fix_ai_path_order_bug);
 		flags.set(AI::Profile_Flags::Aspect_invulnerability_fix);
 		flags.set(AI::Profile_Flags::Use_actual_primary_range);
-		flags.set(AI::Profile_Flags::Fightercraft_nonshielded_ships_can_manage_ets);
+		flags.set(AI::Profile_Flags::fightercraft_nonshielded_ships_can_manage_ets);
 	}
 	// this flag has been enabled ever since 3.7.2
 	if (mod_supports_version(3, 7, 2)) {
@@ -897,10 +770,6 @@ void ai_profile_t::reset()
 	if (mod_supports_version(3, 6, 10)) {
 		flags.set(AI::Profile_Flags::Reset_last_hit_target_time_for_player_hits);
 	}
-	// backwards compatible flag for a bug accidentally introduced during this time
-	if (mod_supports_version(3, 6, 14) && !mod_supports_version(23, 1, 0)) {
-		flags.set(AI::Profile_Flags::Carry_shield_difficulty_scaling_bug);
-	}
 	if (mod_supports_version(21, 4, 0)) {
 		flags.set(AI::Profile_Flags::Fixed_ship_weapon_collision);
 	}
@@ -914,18 +783,4 @@ void ai_profile_t::reset()
 		flags.set(AI::Profile_Flags::No_continuous_turn_on_attack);
 		flags.set(AI::Profile_Flags::Fixed_removing_play_dead_order);
 	}
-	if (mod_supports_version(23, 2, 0)) {
-		flags.set(AI::Profile_Flags::Ships_playing_dead_dont_manage_ets);
-	}
-	if (mod_supports_version(23, 4, 0)) {
-		flags.set(AI::Profile_Flags::Hudsquadmsg_tactical_disarm_disable);
-	}
-	if (mod_supports_version(24, 2, 0)) {
-		flags.set(AI::Profile_Flags::Debris_respects_big_damage);
-		flags.set(AI::Profile_Flags::Force_beam_turret_fov);
-		flags.set(AI::Profile_Flags::Guards_ignore_protected_attackers);
-	}
-	if (mod_supports_version(25, 0, 0)) {
-		flags.set(AI::Profile_Flags::Fix_avoid_shockwave_bugs);
-	}
 }
@@ -53,12 +53,9 @@ public:
 	float shield_energy_scale[NUM_SKILL_LEVELS];			// shield energy available
 	float afterburner_recharge_scale[NUM_SKILL_LEVELS];		// speed of afterburner recharge
 	float player_damage_scale[NUM_SKILL_LEVELS];			// damage applied to the player
-	float player_damage_inflicted_scale[NUM_SKILL_LEVELS];	// damage applied by the player
 	
 	float subsys_damage_scale[NUM_SKILL_LEVELS];			// damage applied to a player subsystem
 	float beam_friendly_damage_cap[NUM_SKILL_LEVELS];		// damage cap values for friendly beam fire
-	float weapon_friendly_damage_cap[NUM_SKILL_LEVELS];
-	float weapon_self_damage_cap[NUM_SKILL_LEVELS];
 	float turn_time_scale[NUM_SKILL_LEVELS];				// speed at which enemy ships turn
 	float glide_attack_percent[NUM_SKILL_LEVELS];			// SUSHI: The likelihood (0.0-1.0) of the AI to use the "glide attack" move
 	float circle_strafe_percent[NUM_SKILL_LEVELS];			// SUSHI: The likelihood (0.0-1.0) of the AI to use the "circle strafe" move
@@ -99,10 +96,7 @@ public:
 	// Player-specific autoaim FOV override
 	float player_autoaim_fov[NUM_SKILL_LEVELS];

-	float detail_distance_mult[MAX_DETAIL_VALUE + 1];	//MAX_DETAIL_VALUE really needs to be 4
-
-	// minimum radius for the line-of-sight (los) detection --wookieejedi
-	float los_min_detection_radius;
+	float detail_distance_mult[MAX_DETAIL_LEVEL + 1];	//MAX_DETAIL_LEVEL really needs to be 4

 	int ai_path_mode;

@@ -123,27 +117,6 @@ public:
 	// how often turrets shoulds check for new targets, milliseconds
 	float turret_target_recheck_time;

-	// Multiplier value so the player can also experience rotational effects from collisions --wookieejedi
-	float rot_fac_multiplier_ply_collisions; 
-
-	// Collision avoidance options  --developed by asteroth, exposed by wookieejedi
-	//   Velocity / turn rate gives us a vector which represents the minimum 'bug out' distance.
-	//   However this will be a significant underestimate, it doesn't take into account acceleration
-	//   with regards to its turn speed, nor already existing rotvel, nor the angular distance
-	//   to the particular avoidance vector it comes up with.
-	//   These would significantly complicate the calculation, so for now, it is all bundled into these magic numbers.
-	float better_collision_avoid_aggression_combat;
-	float better_collision_avoid_aggression_guard;
-
-	// AI strafing options  --wookieejedi
-	float standard_strafe_when_below_speed; // Speed at which standard strafing large ships is possibly triggered
-	float strafe_retreat_box_dist;          // Distance beyond the bounding box to retreat to strafing point 
-	float strafe_max_unhit_time;            // Maximum amount of time to stay in strafe mode if not hit
-
-	// AI guard options  --wookieejedi
-	float guard_big_orbit_above_target_radius; // Radius of guardee that triggers ai_big_guard() 
-	float guard_big_orbit_max_speed_percent;   // Max percent of forward speed that is used in ai_big_guard() 
-
    void reset();
 };

@@ -39,9 +39,10 @@
 #define MIN_DOT_TO_ATTACK_MOVING_SUBSYS	0.97f

 // AI BIG MAGIC NUMBERS
-// Select strafing options are now exposed to modders  --wookieejedi
 #define	STRAFE_RETREAT_COLLIDE_TIME	2.0		// when anticipated collision time is less than this, begin retreat
 #define	STRAFE_RETREAT_COLLIDE_DIST	100		// when perpendicular distance to *surface* is less than this, begin retreat
+#define	STRAFE_RETREAT_BOX_DIST			300		// distance beyond the bounding box to retreat
+#define STRAFE_MAX_UNHIT_TIME		20		// Maximum amount of time to stay in strafe mode if not hit

 #define	EVADE_BOX_BASE_DISTANCE			300		// standard distance to end evade submode
 #define	EVADE_BOX_MIN_DISTANCE			200		// minimun distance to end evade submode, after long time
@@ -66,8 +67,9 @@ int	ai_big_maybe_follow_subsys_path(int do_dot_check=1);
 void ai_big_strafe_position();
 static int ai_big_strafe_maybe_retreat(const vec3d *target_pos);

-extern void compute_desired_rvec(vec3d *rvec, const vec3d *goal_pos, const vec3d *cur_pos);
-extern void big_ship_collide_recover_start(const object *objp, const object *big_objp, const vec3d *collision_normal);
+extern int model_which_octant_distant_many( vec3d *pnt, int model_num,matrix *model_orient, vec3d * model_pos, polymodel **pm, int *octs);
+extern void compute_desired_rvec(vec3d *rvec, vec3d *goal_pos, vec3d *cur_pos);
+extern void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d *collision_normal);


 //	Called by ai_big_pick_attack_point.
@@ -75,15 +77,16 @@ extern void big_ship_collide_recover_start(const object *objp, const object *big
 //	If truly_random flag set (haha), then generate a pretty random number.  Otherwise, generate a static rand which
 //	tends to not change from frame to frame.
 //	Try four times and choose nearest point to increase chance of getting a good point.
-void ai_bpap(const object *objp, const vec3d *attacker_objp_pos, const vec3d *attacker_objp_fvec, vec3d *attack_point, vec3d *local_attack_point, float fov, float weapon_travel_dist, vec3d *surface_normal, const ship_subsys *ss)
+void ai_bpap(object *objp, vec3d *attacker_objp_pos, vec3d *attacker_objp_fvec, vec3d *attack_point, vec3d *local_attack_point, float fov, float weapon_travel_dist, vec3d *surface_normal, ship_subsys *ss)
 {
 	float		nearest_dist;
 	vec3d	result_point, best_point;
 	vec3d	rel_point;
 	int		num_tries;
-	int		i;	
+	model_octant	*octp;
+	polymodel	*pm;
+	int		i, q, octs[4];	
 	ship_info *sip = &Ship_info[Ships[objp->instance].ship_info_index];
-	polymodel* pm = model_get(sip->model_num);
 	model_subsystem *tp = NULL;
 	if (ss != NULL)
 		tp = ss->system_info;	
@@ -91,53 +94,63 @@ void ai_bpap(const object *objp, const vec3d *attacker_objp_pos, const vec3d *at
 	best_point = objp->pos;
 	nearest_dist = weapon_travel_dist;

-	// attempt anywhere from 16 to 4 times, more if we're closer
+	model_which_octant_distant_many(attacker_objp_pos, sip->model_num, &objp->orient, &objp->pos, &pm, octs);
+
 	num_tries = (int) (vm_vec_dist(&objp->pos, attacker_objp_pos)/objp->radius);
+
 	if (num_tries >= 4)
 		num_tries = 1;
 	else
-		num_tries = (4 - num_tries) * 4;
+		num_tries = 4 - num_tries;

-	vm_vec_zero(local_attack_point);
+	//	Index #0 is best one.
+	if ( pm->octants[octs[0]].verts ) {
+		*local_attack_point = *pm->octants[octs[0]].verts[0];	//	Set just in case it doesn't get set below.
+	} else {
+		vm_vec_zero(local_attack_point);
+	}

-	auto collision_tree = model_get_bsp_collision_tree(pm->submodel[pm->detail[0]].collision_tree_index);
+	for (q=0; q<4; q++) {
+		octp = &pm->octants[octs[q]];
+		if (octp->nverts > 0) {

-	if (!collision_tree->poly_centers.empty()) {
-		int num_polies = (int)collision_tree->poly_centers.size();
+			if (num_tries > octp->nverts)
+				num_tries = octp->nverts;

-		if (num_tries > num_polies)
-			num_tries = num_polies;
+			if (num_tries > octp->nverts)
+				num_tries = octp->nverts;

-		for (i=0; i<num_tries; i++) {
-			int	index;
-			float	dist, dot;
-			vec3d	v2p;
+			for (i=0; i<num_tries; i++) {
+				int	index;
+				float	dist, dot;
+				vec3d	v2p;

-			index = (int) (frand() * num_polies);
+				index = (int) (frand() * (octp->nverts));

-			rel_point = collision_tree->poly_centers[index];
-			vm_vec_unrotate(&result_point, &rel_point, &objp->orient);
-			vm_vec_add2(&result_point, &objp->pos);
+				rel_point = *octp->verts[index];
+				vm_vec_unrotate(&result_point, &rel_point, &objp->orient);
+				vm_vec_add2(&result_point, &objp->pos);

-			dist = vm_vec_normalized_dir(&v2p, &result_point, attacker_objp_pos);
-			bool in_fov = false;
+				dist = vm_vec_normalized_dir(&v2p, &result_point, attacker_objp_pos);
+				bool in_fov = false;

-			dot = vm_vec_dot(&v2p, attacker_objp_fvec);
-			if (tp == NULL) {
-				if (dot > fov)
-					in_fov = true;
-			} else {
-				in_fov = turret_fov_test(ss, attacker_objp_fvec, &v2p);
-			}
+				dot = vm_vec_dot(&v2p, attacker_objp_fvec);
+				if (tp == NULL) {
+					if (dot > fov)
+						in_fov = true;
+				} else {
+					in_fov = turret_fov_test(ss, attacker_objp_fvec, &v2p);
+				}

-			if (in_fov) {
-				if (dist < nearest_dist) {
-					nearest_dist = dist;
-					best_point = result_point;
-					*local_attack_point = rel_point;
-					Assert( !vm_is_vec_nan(local_attack_point) );
-					if (dot > (1.0f + fov)/2.0f)	//	If this point is quite good, quit searching for a better one.
-						goto done_1;
+				if (in_fov) {
+					if (dist < nearest_dist) {
+						nearest_dist = dist;
+						best_point = result_point;
+						*local_attack_point = rel_point;
+						Assert( !vm_is_vec_nan(local_attack_point) );
+						if (dot > (1.0f + fov)/2.0f)	//	If this point is quite good, quit searching for a better one.
+							goto done_1;
+					}
 				}
 			}
 		}
@@ -161,6 +174,8 @@ done_1:
 	}
 	
 	mc_info mc;
+	mc_info_init(&mc);
+
 	mc.model_instance_num = Ships[objp->instance].model_instance_num;
 	mc.model_num = sip->model_num;
 	mc.orient = &objp->orient;
@@ -192,7 +207,7 @@ done_1:
 //
 //	Note: Default value for fov is 1.0f  1.0f means don't use fov parameter.
 //	If fov != 1.0f, try up to four times to find a point that's in the field of view.
-void ai_big_pick_attack_point_turret(const object *objp, ship_subsys *ssp, const vec3d *gpos, const vec3d *gvec, vec3d *attack_point, float fov, float weapon_travel_dist)
+void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vec3d *gpos, vec3d *gvec, vec3d *attack_point, float fov, float weapon_travel_dist)
 {
 	if (!timestamp_elapsed(ssp->turret_pick_big_attack_point_timestamp)) {
 		vec3d	result_point;
@@ -212,7 +227,7 @@ void ai_big_pick_attack_point_turret(const object *objp, ship_subsys *ssp, const
 //	Note: Default value for fov is 1.0f  1.0f means don't use fov parameter.
 //	If fov != 1.0f, try up to four times to find a point that's in the field of view.
 //	Note, attacker_objp can be a ship or a weapon.
-void ai_big_pick_attack_point(const object *objp, const object *attacker_objp, vec3d *attack_point, float fov)
+void ai_big_pick_attack_point(object *objp, object *attacker_objp, vec3d *attack_point, float fov)
 {
 	Assert(objp->instance > -1);
 	Assert(objp->type == OBJ_SHIP);
@@ -410,7 +425,7 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 				}
 			}

-			if ( ship_subsystem_in_sight(En_objp, aip->targeted_subsys, &geye, &gsubpos, true) ) {
+			if ( ship_subsystem_in_sight(En_objp, aip->targeted_subsys, &geye, &gsubpos, 1) ) {
 				subsys_in_sight = 1;
 			}
 		}
@@ -534,18 +549,18 @@ bool ai_new_maybe_reposition_attack_subsys() {

 	// get world pos of eye (stored in geye)
 	ep = &(pm->view_positions[Ships[Pl_objp->instance].current_viewpoint]);
-	model_local_to_global_point(&geye, &ep->pnt, pm, 0, &Pl_objp->orient, &Pl_objp->pos);
+	model_local_to_global_point(&geye, &ep->pnt, pm->id, 0, &Pl_objp->orient, &Pl_objp->pos);

 	// get world pos of subsystem
-	get_subsystem_pos(&gsubpos, target_objp, aip->targeted_subsys);
+	vm_vec_unrotate(&gsubpos, &aip->targeted_subsys->system_info->pnt, &En_objp->orient);
+	vm_vec_add2(&gsubpos, &En_objp->pos);

 	// you're in sight! shoot it!
-	if (ship_subsystem_in_sight(En_objp, aip->targeted_subsys, &geye, &gsubpos, false))
+	if (ship_subsystem_in_sight(En_objp, aip->targeted_subsys, &geye, &gsubpos, 0))
 		return false;

 	// not in sight, gotta get there
 	vec3d* good_pos = nullptr;
-	vec3d world_goal_pos;
 	// For performance reasons we only recheck once a second, otherwise we reuse the last found target.
 	if (timestamp_elapsed(aip->next_dynamic_path_check_time)) {
 		vec3d tgt2pl = Pl_objp->pos - target_objp->pos;
@@ -567,6 +582,7 @@ bool ai_new_maybe_reposition_attack_subsys() {
 		vm_rot_point_around_line(&goal_pos, &tgt2pl, angle2goal, &vmd_zero_vector, &cross);

 		// then scale in (or out) towards our subsys
+		vec3d world_goal_pos;
 		float new_radius = ((subsys_dist - pl_dist) * (angle2goal / angle2subsys)) + pl_dist;
 		vm_vec_copy_scale(&world_goal_pos, &goal_pos, new_radius / pl_dist);
 		world_goal_pos += target_objp->pos;
@@ -602,7 +618,6 @@ bool ai_new_maybe_reposition_attack_subsys() {
 		else
 			good_pos = &world_goal_pos;
 		aip->next_dynamic_path_check_time = timestamp( AI_DYNAMIC_PATH_RECHECK_DELAY );
-		aip->last_dynamic_path_goal = *good_pos;

 	}
 	else{ //Not enough time has passed till recheck.
@@ -616,17 +631,15 @@ bool ai_new_maybe_reposition_attack_subsys() {
 	accelerate_ship(aip, subsys_distance > 200.0f ? 1.0f : subsys_distance / 200.0f);

 	if (!(Ships[Pl_objp->instance].flags[Ship::Ship_Flags::Afterburner_locked])) {
-		if (ai_willing_to_afterburn_hard(aip) && subsys_distance > 1000.0f)
-			ai_afterburn_hard(Pl_objp, aip);
-		else if (subsys_distance > 300.0f) {
+		if (subsys_distance > 300.0f) {
 			if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 				afterburners_start(Pl_objp);
 				aip->afterburner_stop_time = Missiontime + 2 * F1_0;
 			}
 		}
-	} else
-		afterburners_stop(Pl_objp);
-
+		else
+			afterburners_stop(Pl_objp);
+	}
 	return true;

 }
@@ -718,21 +731,19 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 						}
 					}
 			}
+			
+			// Since ship is moving slowly and attacking a large ship, scan if enemy fighters are near, if so
+			// then enter strafe mode
+			if ( ai_big_maybe_start_strafe(aip, sip) ) {
+				aip->previous_mode = aip->mode;
+				aip->mode = AIM_STRAFE;
+				aip->submode_parm0 = Missiontime;	// use parm0 as time strafe mode entered (i.e. MODE start time)
+				ai_big_strafe_position();
+				return;
+			}

 		} // end if ( Pl_objp->phys_info.speed < 3.0f ) 

-		// if moving slowly and attacking a large ship, 
-		// check if need to enter standard strafe mode
-		// including ai_profile flag and if enemy fighters are near
-		if (Pl_objp->phys_info.speed < The_mission.ai_profile->standard_strafe_when_below_speed && 
-			(The_mission.ai_profile->flags[AI::Profile_Flags::Standard_strafe_used_more] || ai_big_maybe_start_strafe(aip, sip))) {
-			aip->previous_mode = aip->mode;
-			aip->mode = AIM_STRAFE;
-			aip->submode_parm0 = Missiontime;	// use parm0 as time strafe mode entered (i.e. MODE start time)
-			ai_big_strafe_position();
-			return;
-		}
-
 		//Maybe enter glide strafe (check every 8 seconds, on a different schedule for each ship)
 		if ((sip->can_glide == true) && !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && static_randf((Missiontime + static_rand(aip->shipnum)) >> 19) < aip->ai_glide_strafe_percent) {
 			aip->previous_mode = aip->mode;
@@ -748,7 +759,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 			if (ai_new_maybe_reposition_attack_subsys())
 				return;
 		} else if ( ai_big_maybe_follow_subsys_path() ) {
-			if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && !ai_willing_to_afterburn_hard(aip)) {
+			if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 				afterburners_stop(Pl_objp);
 			}
 			return;
@@ -840,9 +851,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 			} else {
 				accelerate_ship(aip, accel);

-				if (ai_willing_to_afterburn_hard(aip) && accel > 0.99f && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked])) {
-					ai_afterburn_hard(Pl_objp, aip);
-				} else if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel > 0.95f)) {
+				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel > 0.95f)) {
 					if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 						afterburners_start(Pl_objp);
 						aip->afterburner_stop_time = Missiontime + 3*F1_0;
@@ -914,13 +923,13 @@ static void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy)
 			}

 			if (tswp->num_secondary_banks > 0) {
-				if ( !(En_objp->flags[Object::Object_Flags::Protected]) || ai_goal_is_disable_or_disarm(aip->goals[0].ai_mode) ) {
+				if (!(En_objp->flags[Object::Object_Flags::Protected]) || (aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP))) {
 					bool valid_secondary = ai_choose_secondary_weapon(Pl_objp, aip, En_objp);
 					int current_bank = tswp->current_secondary_bank;
 					if (current_bank > -1 && valid_secondary) {
 						weapon_info	*swip = &Weapon_info[tswp->secondary_bank_weapons[current_bank]];

-						if ( !(En_objp->flags[Object::Object_Flags::Protected]) || (ai_goal_is_disable_or_disarm(aip->goals[0].ai_mode) && swip->wi_flags[Weapon::Info_Flags::Puncture]) ) { //override lockdown on protected ships when using anti subsystem weapons - Valathil
+						if(!(En_objp->flags[Object::Object_Flags::Protected]) || ((aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP)) && swip->wi_flags[Weapon::Info_Flags::Puncture] )) { //override lockdown on protected ships when using anti subsystem weapons - Valathil
 							//	If ship is protected and very low on hits, don't fire missiles.
 							if (!(En_objp->flags[Object::Object_Flags::Protected]) || (En_objp->hull_strength > 10*swip->damage)) {
 								if (aip->ai_flags[AI::AI_Flags::Unload_secondaries]) {
@@ -1035,7 +1044,7 @@ void ai_big_chase()
 	ai_big_pick_attack_point(En_objp, Pl_objp, &enemy_pos, 0.8f);

 	weapon_info* wip = ai_get_weapon(&shipp->weapons);
-	bool ballistic_aiming = !IS_VEC_NULL(&The_mission.gravity) && wip && wip->gravity_const != 0.0f;
+	bool ballistic_aiming = !IS_VEC_NULL(&The_mission.gravity) && wip->gravity_const != 0.0f;
 	bool valid_ballistic_trajectory = true;

 	if (!ballistic_aiming) {
@@ -1440,7 +1449,7 @@ static int ai_big_strafe_maybe_retreat(const vec3d *target_pos)

 	//if ((dot_to_enemy > 1.0f - 0.1f * En_objp->radius/(dist_to_enemy + 1.0f)) && (Pl_objp->phys_info.speed > dist_to_enemy/5.0f))

-	// Inside 2 sec retreat, setting goal point to box point + strafe_retreat_box_dist
+	// Inside 2 sec retreat, setting goal point to box point + 300m
 	// If collision, use std collision resolution.
 	if ( !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && ((aip->ai_flags[AI::AI_Flags::Target_collision]) || (time_to_target < STRAFE_RETREAT_COLLIDE_TIME) || (dist_normal_to_target < STRAFE_RETREAT_COLLIDE_DIST + speed_to_dist_penalty)) ) {
 		if (aip->ai_flags[AI::AI_Flags::Target_collision]) {
@@ -1448,13 +1457,13 @@ static int ai_big_strafe_maybe_retreat(const vec3d *target_pos)
 			aip->ai_flags.remove(AI::AI_Flags::Target_collision);
 			big_ship_collide_recover_start(Pl_objp, En_objp, nullptr);
 		} else {
-			// too close for comfort so fly to box point + strafe_retreat_box_dist
+			// too close for comfort so fly to box point + 300
 			aip->submode = AIS_STRAFE_RETREAT1;
 			aip->submode_start_time = Missiontime;

 			int is_inside;
 			vec3d goal_point;
-			get_world_closest_box_point_with_delta(&goal_point, En_objp, &Pl_objp->pos, &is_inside, The_mission.ai_profile->strafe_retreat_box_dist);
+			get_world_closest_box_point_with_delta(&goal_point, En_objp, &Pl_objp->pos, &is_inside, STRAFE_RETREAT_BOX_DIST);

 			// set goal point
 			aip->goal_point = goal_point;
@@ -1569,7 +1578,8 @@ void ai_big_strafe_attack()
 	accelerate_ship(aip, accel);

 	// if haven't been hit in quite a while, leave strafe mode
-	fix long_enough = fl2f(The_mission.ai_profile->strafe_max_unhit_time);
+	fix long_enough;
+	long_enough = F1_0 * STRAFE_MAX_UNHIT_TIME;
 	if ( (last_hit > long_enough) && ( (Missiontime - aip->submode_parm0) > long_enough) ) {
 		ai_big_switch_to_chase_mode(aip);
 	}
@@ -1616,11 +1626,11 @@ void ai_big_strafe_glide_attack()
 	//If we haven't chosen the goal point yet, do so now
 	if (aip->submode_parm1 == 0) {
 		//Pick goal point. This should be a random point that passes through the circle whose normal is the vector between attacker and target
-		vec3d targetToAttackerDir;
-		vm_vec_normalized_dir(&targetToAttackerDir, &Pl_objp->pos, &target_objp->pos);
-		matrix orient;
-		vm_vector_2_matrix_norm(&orient, &targetToAttackerDir, nullptr, nullptr);
+		vec3d targetToAttacker;
 		vec3d tangentPoint;
+		vm_vec_sub(&targetToAttacker, &Pl_objp->pos, &target_objp->pos);
+		matrix orient;
+		vm_vector_2_matrix(&orient, &targetToAttacker, NULL, NULL);
 		vm_vec_random_in_circle(&tangentPoint, &target_objp->pos, &orient, target_objp->radius + GLIDE_STRAFE_DISTANCE, true);
 		//Get tangent point in coords relative to ship, scale it up so the actual goal point is far away, then put back in world coords
 		vm_vec_sub2(&tangentPoint, &Pl_objp->pos);
@@ -1641,7 +1651,7 @@ void ai_big_strafe_glide_attack()
 		//Keep going until we are too far away.
 		//If we are still on approach but too far away, this will still trigger. This will allow us to reposition the target
 		//point and allow for a "jinking" effect.
-		if (target_ship_dist > (The_mission.ai_profile->strafe_retreat_box_dist + target_objp->radius) &&
+		if (target_ship_dist > (STRAFE_RETREAT_BOX_DIST + target_objp->radius) &&
 			Missiontime - aip->submode_start_time > i2f(GLIDE_STRAFE_MIN_TIME)) {
 			//This checks whether we are moving toward the target or away from it.  If moving towards, we reset the stage so that we
 			//pick a new attack vector (jinking). If moving away, we're at the end of a run so do a full reset (possibly allowing a 
@@ -1691,7 +1701,7 @@ void ai_big_strafe_glide_attack()

 	// if haven't been hit in quite a while, leave strafe mode
 	// (same as ai_big_strafe_attack)
-	fix long_enough = fl2f(The_mission.ai_profile->strafe_max_unhit_time);
+	fix long_enough = F1_0 * STRAFE_MAX_UNHIT_TIME;
 	if ( (Missiontime - aip->last_hit_time > long_enough) && ( (Missiontime - aip->submode_parm0) > long_enough) ) {
 		ai_big_switch_to_chase_mode(aip);
 	}
@@ -1841,7 +1851,7 @@ void ai_big_strafe()

 /*
 	if ( aip->goal_objnum != aip->target_objnum ) {
-		UNREACHABLE("The goal objnum does not match the target objnum in ai_big_strafe(), please report to the SCP!");	// what is going on here? - Get Alan
+		Int3();	// what is going on here? - Get Alan
 		aip->mode = AIM_NONE;
 		return;
 	}
@@ -1887,7 +1897,7 @@ void ai_big_strafe()
 	{
 		//Re-roll for random sidethrust every 2 seconds
 		if (static_randf((Missiontime + static_rand(aip->shipnum)) >> 17) < aip->ai_random_sidethrust_percent) {
-			do_random_sidethrust(aip, &Ship_info[Ships[aip->shipnum].ship_info_index]);
+			do_random_sidethrust(aip, &Ship_info[Ships[Objects[aip->target_objnum].instance].ship_info_index]);
 		}
 	}
 }
@@ -1933,10 +1943,7 @@ int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)
 	weapon_objp = &Objects[weapon_objnum];
 	Assert(weapon_objp->type == OBJ_WEAPON);

-	if (weapon_objp->parent < 0) {
-		return 0;
-	}
-	Assert(weapon_objp->parent < MAX_OBJECTS);
+	Assert(weapon_objp->parent >= 0 && weapon_objp->parent < MAX_OBJECTS);
 	parent_objp = &Objects[weapon_objp->parent];
 	if ( (parent_objp->signature != weapon_objp->parent_sig) || (parent_objp->type != OBJ_SHIP) ) {
 		return 0;
@@ -24,8 +24,8 @@ void	ai_big_subsys_path_cleanup(ai_info *aip);
 void	ai_big_strafe();
 int	ai_big_maybe_enter_strafe_mode(const object *objp, int weapon_objnum);
 void	ai_big_strafe_maybe_attack_turret(const object *ship_objp, const object *weapon_objp);
-void ai_big_pick_attack_point(const object *objp, const object *attacker_objp, vec3d *attack_point, float fov=1.0f);
-void ai_big_pick_attack_point_turret(const object *objp, ship_subsys *ssp, const vec3d *gpos, const vec3d *gvec, vec3d *attack_point, float weapon_travel_dist, float fov=1.0f);
+void ai_big_pick_attack_point(object *objp, object *attacker_objp, vec3d *attack_point, float fov=1.0f);
+void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vec3d *gpos, vec3d *gvec, vec3d *attack_point, float weapon_travel_dist, float fov=1.0f);

 // default distance for following subsystem path points --wookieejedi
 // the value is 5 because that was the original value specified in ai_big_maybe_follow_subsys_path()
@@ -24,87 +24,79 @@ struct ai_info;

 // macros for goals which get set via sexpressions in the mission code

-// types of ai goals -- these will help us to determine which goals should
+// types of ai goals -- tyese types will help us to determination on which goals should
 // have priority over others (i.e. when a player issues a goal to a wing, then a seperate
 // goal to a ship in that wing).  We would probably use this type in conjunction with
 // goal priority to establish which goal to follow
-enum class ai_goal_type
-{
-	INVALID = 0,
-	EVENT_SHIP,		// from mission event direct to ship
-	EVENT_WING,		// from mission event direct to wing
-	PLAYER_SHIP,	// from player direct to ship
-	PLAYER_WING,	// from player direct to wing
-	DYNAMIC			// created on the fly
-};
+#define AIG_TYPE_EVENT_SHIP			1		// from mission event direct to ship
+#define AIG_TYPE_EVENT_WING			2		// from mission event direct to wing
+#define AIG_TYPE_PLAYER_SHIP		3		// from player direct to ship
+#define AIG_TYPE_PLAYER_WING		4		// from player direct to wing
+#define AIG_TYPE_DYNAMIC			5		// created on the fly

-// IMPORTANT!  If you add a new AI_GOAL_x enum, be sure to update the functions
+#define AI_GOAL_NONE				-1
+
+// IMPORTANT!  If you add a new AI_GOAL_x define, be sure to update the functions
 // ai_update_goal_references() and query_referenced_in_ai_goals() or else risk breaking
 // Fred.  If the goal you add doesn't have a target (such as chase_any), then you don't have
 // to worry about doing this.  Also add it to list in Fred\Management.cpp, and let Hoffoss know!
 // WMC - Oh and add them to Ai_goal_names plz. TY! :)
 // Goober5000 - As well as Ai_goal_text and Ai_goal_list, if appropriate
-enum ai_goal_mode : uint8_t
-{
-	AI_GOAL_NONE = 0,
-	AI_GOAL_PLACEHOLDER_1,
+#define AI_GOAL_CHASE					(1<<1)	// 0x00000002
+#define AI_GOAL_DOCK					(1<<2)	// 0x00000004	// used for undocking as well
+#define AI_GOAL_WAYPOINTS				(1<<3)	// 0x00000008
+#define AI_GOAL_WAYPOINTS_ONCE			(1<<4)	// 0x00000010
+#define AI_GOAL_WARP					(1<<5)	// 0x00000020
+#define AI_GOAL_DESTROY_SUBSYSTEM		(1<<6)	// 0x00000040
+#define AI_GOAL_FORM_ON_WING			(1<<7)	// 0x00000080
+#define AI_GOAL_UNDOCK					(1<<8)	// 0x00000100
+#define AI_GOAL_CHASE_WING				(1<<9)	// 0x00000200
+#define AI_GOAL_GUARD					(1<<10)	// 0x00000400
+#define AI_GOAL_DISABLE_SHIP			(1<<11)	// 0x00000800
+#define AI_GOAL_DISARM_SHIP				(1<<12)	// 0x00001000
+#define AI_GOAL_CHASE_ANY				(1<<13)	// 0x00002000
+#define AI_GOAL_IGNORE					(1<<14)	// 0x00004000
+#define AI_GOAL_GUARD_WING				(1<<15)	// 0x00008000
+#define AI_GOAL_EVADE_SHIP				(1<<16)	// 0x00010000

-	AI_GOAL_CHASE,              // per the original #define list, AI_GOAL_CHASE started at 2 (1<<1)
-	AI_GOAL_DOCK,               // used for undocking as well
-	AI_GOAL_WAYPOINTS,
-	AI_GOAL_WAYPOINTS_ONCE,
-	AI_GOAL_WARP,
-	AI_GOAL_DESTROY_SUBSYSTEM,
-	AI_GOAL_FORM_ON_WING,
-	AI_GOAL_UNDOCK,
-	AI_GOAL_CHASE_WING,
-	AI_GOAL_GUARD,
-	AI_GOAL_DISABLE_SHIP,
-	AI_GOAL_DISARM_SHIP,
-	AI_GOAL_CHASE_ANY,
-	AI_GOAL_IGNORE,
-	AI_GOAL_GUARD_WING,
-	AI_GOAL_EVADE_SHIP,
+// the next goals are for support ships only
+#define AI_GOAL_STAY_NEAR_SHIP			(1<<17)	// 0x00020000
+#define AI_GOAL_KEEP_SAFE_DISTANCE		(1<<18)	// 0x00040000
+#define AI_GOAL_REARM_REPAIR			(1<<19)	// 0x00080000

-	// the next goals are for support ships only
-	AI_GOAL_STAY_NEAR_SHIP,
-	AI_GOAL_KEEP_SAFE_DISTANCE,
-	AI_GOAL_REARM_REPAIR,
+// resume regular goals
+#define AI_GOAL_STAY_STILL				(1<<20)	// 0x00100000
+#define AI_GOAL_PLAY_DEAD				(1<<21)	// 0x00200000

-	// resume regular goals
-	AI_GOAL_STAY_STILL,
-	AI_GOAL_PLAY_DEAD,
+// added by SCP
+#define AI_GOAL_CHASE_WEAPON			(1<<22)	// 0x00400000
+#define AI_GOAL_FLY_TO_SHIP				(1<<23) // 0x00800000
+#define AI_GOAL_IGNORE_NEW				(1<<24)	// 0x01000000
+#define AI_GOAL_CHASE_SHIP_CLASS		(1<<25)	// 0x02000000
+#define AI_GOAL_PLAY_DEAD_PERSISTENT	(1<<26)	// 0x03000000
+#define AI_GOAL_LUA						(1<<27) // 0x04000000

-	// added by SCP
-	AI_GOAL_CHASE_WEAPON,
-	AI_GOAL_FLY_TO_SHIP,
-	AI_GOAL_IGNORE_NEW,
-	AI_GOAL_CHASE_SHIP_CLASS,
-	AI_GOAL_PLAY_DEAD_PERSISTENT,
-	AI_GOAL_LUA,
-	AI_GOAL_DISARM_SHIP_TACTICAL,
-	AI_GOAL_DISABLE_SHIP_TACTICAL,
+// now the masks for ship types

-	AI_GOAL_NUM_VALUES
-};
+// Goober5000: added AI_GOAL_STAY_NEAR_SHIP and AI_GOAL_KEEP_SAFE_DISTANCE as valid for fighters
+//WMC - Don't need these anymore. Whee!
+/*
+#define AI_GOAL_ACCEPT_FIGHTER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_CHASE | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_WARP | AI_GOAL_DESTROY_SUBSYSTEM | AI_GOAL_CHASE_WING | AI_GOAL_GUARD | AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP | AI_GOAL_CHASE_ANY | AI_GOAL_IGNORE | AI_GOAL_IGNORE_NEW | AI_GOAL_GUARD_WING | AI_GOAL_EVADE_SHIP | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD | AI_GOAL_PLAY_DEAD_PERSISTENT | AI_GOAL_STAY_NEAR_SHIP | AI_GOAL_KEEP_SAFE_DISTANCE )
+#define AI_GOAL_ACCEPT_BOMBER			( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_FIGHTER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_STEALTH		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_FIGHTER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_TRANSPORT		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_CHASE | AI_GOAL_CHASE_WING | AI_GOAL_DOCK | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_WARP | AI_GOAL_UNDOCK | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD | AI_GOAL_PLAY_DEAD_PERSISTENT | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_FREIGHTER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_TRANSPORT | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_CRUISER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_FREIGHTER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_CORVETTE		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_GAS_MINER		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_AWACS			( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_CAPITAL		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CRUISER & ~(AI_GOAL_DOCK | AI_GOAL_UNDOCK) | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_SUPERCAP		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_CAPITAL | AI_GOAL_STAY_NEAR_SHIP )
+#define AI_GOAL_ACCEPT_SUPPORT		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_DOCK | AI_GOAL_UNDOCK | AI_GOAL_WAYPOINTS | AI_GOAL_WAYPOINTS_ONCE | AI_GOAL_STAY_NEAR_SHIP | AI_GOAL_KEEP_SAFE_DISTANCE | AI_GOAL_STAY_STILL | AI_GOAL_PLAY_DEAD | AI_GOAL_PLAY_DEAD_PERSISTENT )
+#define AI_GOAL_ACCEPT_ESCAPEPOD		( AI_GOAL_FLY_TO_SHIP | AI_GOAL_ACCEPT_TRANSPORT| AI_GOAL_STAY_NEAR_SHIP  )
+*/

-inline ai_goal_mode int_to_ai_goal_mode(int int_mode)
-{
-	if (int_mode >= 0 && int_mode < AI_GOAL_NUM_VALUES)
-		return static_cast<ai_goal_mode>(int_mode);
-
-	Warning(LOCATION, "ai_goal_mode %d out of range!  Setting to AI_GOAL_NONE.", int_mode);
-	return AI_GOAL_NONE;
-}
-
-inline bool ai_goal_is_disable_or_disarm(ai_goal_mode ai_mode)
-{
-	return ai_mode == AI_GOAL_DISABLE_SHIP || ai_mode == AI_GOAL_DISABLE_SHIP_TACTICAL || ai_mode == AI_GOAL_DISARM_SHIP || ai_mode == AI_GOAL_DISARM_SHIP_TACTICAL;
-}
-inline bool ai_goal_is_specific_chase(ai_goal_mode ai_mode)
-{
-	return ai_mode == AI_GOAL_CHASE || ai_mode == AI_GOAL_CHASE_WING || ai_mode == AI_GOAL_CHASE_SHIP_CLASS;
-}
+#define MAX_AI_DOCK_NAMES				25

 enum class ai_achievability { ACHIEVABLE, NOT_ACHIEVABLE, NOT_KNOWN, SATISFIED };

@@ -116,16 +108,16 @@ struct ai_lua_parameters {
 // structure for AI goals
 typedef struct ai_goal {
 	int	signature;			//	Unique identifier.  All goals ever created (per mission) have a unique signature.
-	ai_goal_mode ai_mode;	// one of the AI_GOAL_* modes for this goal
+	int	ai_mode;				// one of the AIM_* modes for this goal
 	int	ai_submode;			// maybe need a submode
-	ai_goal_type type;		// one of the ai_goal_type (originally AIG_TYPE_*) values above
+	int	type;					// one of the AIG_TYPE_* values above
 	flagset<AI::Goal_Flags>	flags;				// one of the AIGF_* values above
 	fix	time;					// time at which this goal was issued.
 	int	priority;			// how important is this goal -- number 0 - 100

 	const char *target_name;	// name of the thing that this goal acts upon
 	int		target_name_index;	// index of goal_target_name in Goal_target_names[][]
-	int wp_list_index;			// waypoints that this ship might fly.
+	waypoint_list *wp_list;		// waypoints that this ship might fly.
 	int target_instance;		// instance of thing this ship might be chasing (currently only used for weapons; note, not the same as objnum!)
 	int	target_signature;		// signature of object this ship might be chasing (currently only used for weapons; paired with above value to confirm target)

@@ -150,20 +142,18 @@ typedef struct ai_goal {

 } ai_goal;

-extern void ai_goal_reset(ai_goal *aigp, bool adding_goal = false, ai_goal_mode ai_mode = AI_GOAL_NONE, int ai_submode = -1, ai_goal_type type = ai_goal_type::INVALID);
+extern void ai_goal_reset(ai_goal *aigp, bool adding_goal = false, int ai_mode = AI_GOAL_NONE, int ai_submode = -1, int type = -1);


-typedef flag_def_list_templated<ai_goal_mode> ai_goal_list;
+typedef flag_def_list ai_goal_list;

 extern ai_goal_list Ai_goal_names[];
 extern int Num_ai_goals;

-#define MAX_AI_DOCK_NAMES				25
-
 extern int Num_ai_dock_names;
 extern char Ai_dock_names[MAX_AI_DOCK_NAMES][NAME_LENGTH];

-extern const char *Ai_goal_text(ai_goal_mode goal, int submode);
+extern const char *Ai_goal_text(int goal, int submode);

 // every goal in a mission gets a unique signature
 extern int Ai_goal_signature;
@@ -176,17 +166,17 @@ extern void ai_process_mission_orders( int objnum, ai_info *aip );
 extern int ai_goal_num(ai_goal *goals);

 // adds goals to ships/wing through sexpressions
-extern void ai_add_ship_goal_scripting(ai_goal_mode mode, int submode, int priority, const char *shipname, ai_info *aip, int int_data, float float_data);
-extern void ai_add_ship_goal_sexp(int sexp, ai_goal_type type, ai_info *aip);
-extern void ai_add_wing_goal_sexp(int sexp, ai_goal_type type, wing *wingp);
-extern void ai_add_goal_sub_sexp(int sexp, ai_goal_type type, ai_info *aip, ai_goal *aigp, const char *actor_name);
+extern void ai_add_ship_goal_scripting(int mode, int submode, int priority, char *shipname, ai_info *aip);
+extern void ai_add_ship_goal_sexp( int sexp, int type, ai_info *aip );
+extern void ai_add_wing_goal_sexp( int sexp, int type, wing *wingp );
+extern void ai_add_goal_sub_sexp( int sexp, int type, ai_info *aip, ai_goal *aigp, char *actor_name);

-extern int ai_remove_goal_sexp_sub( int sexp, ai_goal* aigp, bool &remove_more );
+extern int ai_remove_goal_sexp_sub( int sexp, ai_goal* aigp );
 extern void ai_remove_wing_goal_sexp( int sexp, wing *wingp );

 // adds goals to ships/sings through player orders
-extern void ai_add_ship_goal_player(ai_goal_type type, ai_goal_mode mode, int submode, const char* shipname, ai_info* aip, const ai_lua_parameters& lua_target = { object_ship_wing_point_team(), luacpp::LuaValueList{} });
-extern void ai_add_wing_goal_player(ai_goal_type type, ai_goal_mode mode, int submode, const char* shipname, int wingnum, const ai_lua_parameters& lua_target = { object_ship_wing_point_team(), luacpp::LuaValueList{} });
+extern void ai_add_ship_goal_player(int type, int mode, int submode, char* shipname, ai_info* aip, const ai_lua_parameters& lua_target = { object_ship_wing_point_team(), luacpp::LuaValueList{} });
+extern void ai_add_wing_goal_player(int type, int mode, int submode, char* shipname, int wingnum, const ai_lua_parameters& lua_target = { object_ship_wing_point_team(), luacpp::LuaValueList{} });

 extern void ai_remove_ship_goal( ai_info *aip, int index );
 extern void ai_clear_ship_goals( ai_info *aip );
@@ -197,11 +187,11 @@ extern void ai_copy_mission_wing_goal( ai_goal *aigp, ai_info *aip );
 extern void ai_mission_goal_complete( ai_info *aip );
 extern void ai_mission_wing_goal_complete( int wingnum, ai_goal *remove_goalp );

-extern void ai_update_goal_references(ai_goal *goals, sexp_ref_type type, const char *old_name, const char *new_name);
-extern bool query_referenced_in_ai_goals(ai_goal *goals, sexp_ref_type type, const char *name);
+extern void ai_update_goal_references(ai_goal *goals, int type, const char *old_name, const char *new_name);
+extern int query_referenced_in_ai_goals(ai_goal *goals, int type, const char *name);
 extern char *ai_add_dock_name(const char *str);

-extern int ai_query_goal_valid( int ship, ai_goal_mode ai_mode );
+extern int ai_query_goal_valid( int ship, int ai_goal_type );

 extern void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int docker_point, int dockee_point, int immediate = 1 );

@@ -14,24 +14,24 @@
 #include "weapon/weapon.h"

 //Returns true if the specified object is a stealth ship, false if not
-bool is_object_stealth_ship(const object* objp);
+bool is_object_stealth_ship(object* objp);

 //Number of live turrets on the object attacking
-int num_turrets_attacking(const object *turret_parent, int target_objnum);
+int num_turrets_attacking(object *turret_parent, int target_objnum);

 //Determine whether an object is targetable within a nebula (checks for stealth)
-bool object_is_targetable(const object *target, const ship *viewer);
+int object_is_targetable(object *target, ship *viewer);

 //Returns the number of enemy fighters within threshold of pos.
-int num_nearby_fighters(int enemy_team_mask, const vec3d *pos, float threshold);
+int num_nearby_fighters(int enemy_team_mask, vec3d *pos, float threshold);

 //Returns true if OK for *aip to fire its current weapon at its current target.
-bool check_ok_to_fire(int objnum, int target_objnum, const weapon_info *wip, int secondary_bank, const vec3d *firing_pos_global);
+int check_ok_to_fire(int objnum, int target_objnum, weapon_info *wip, int secondary_bank, ship_subsys* turret);

 //Returns true if *aip has a line of sight to its current target.
-bool check_los(int objnum, int target_objnum, float threshold, int primary_bank, int secondary_bank, const vec3d *firing_pos_global);
+bool check_los(int objnum, int target_objnum, float threshold, int primary_bank, int secondary_bank, ship_subsys* turret);

 //Does all the stuff needed to aim and fire a turret.
-void ai_turret_execute_behavior(const ship *shipp, ship_subsys *ss);
+void ai_turret_execute_behavior(ship *shipp, ship_subsys *ss);

 #endif
@@ -18,9 +18,9 @@ void ai_lua_add_mode(int sexp_op, const ai_mode_lua& mode) {
 }

 bool ai_lua_add_order(int sexp_op, player_order_lua order) {
-	Player_orders.emplace_back(order.parseText, order.displayText, -1, sexp_op);
+	Player_orders.emplace_back(vm_strdup(order.parseText.c_str()), vm_strdup(order.displayText.c_str()), -1, sexp_op);
 	Player_orders.back().localize();
-	
+
 	Lua_player_orders.emplace(sexp_op, std::move(order));

 	return true;
@@ -48,140 +48,6 @@ const player_order_lua* ai_lua_find_player_order(int sexp_op) {
 		return &aiLuaOrder->second;
 }

-int ai_lua_get_num_general_orders() {
-	int count = 0;
-	
-	for (const auto& order : Lua_player_orders) {
-		if (order.second.generalOrder) {
-			count++;
-		}
-	}
-
-	return count;
-}
-
-SCP_vector<SCP_string> ai_lua_get_general_order_categories(bool enabled_only)
-{
-	SCP_vector<SCP_string> list;
-
-	for (const auto& order : Lua_player_orders) {
-		const SCP_string &cat = order.second.category;
-
-		// If it's not a general order then move on
-		if (!order.second.generalOrder) {
-			continue;
-		}
-
-		// If the order is not enabled then move on
-		if (enabled_only && !order.second.cur_enabled) {
-			continue;
-		}
-
-		Assertion((cat.length() > 0), "Lua general orders category name must be longer than 0 characters!");
-
-		for (size_t i = 0; i <= list.size(); i++) {
-
-			// reached the end of the list, so add it
-			if (i == list.size()) {
-				list.push_back(cat);
-				break;
-			}
-
-			// if it's already in the list then don't add it
-			if (cat == list[i]) {
-				break;
-			}
-		}
-	}
-
-	return list;
-}
-
-// Provides a list of general orders for mission saving. You can only get one kind
-// of list at a time. If onlyEnabled and onlyValid are both true, for example, you will get
-// a list of onlyEnabled orders. If you need a list of enabled orders that are also valid, you'll
-// need to get both lists separately and compare.
-SCP_vector<SCP_string> ai_lua_get_general_orders(bool onlyEnabled, bool onlyValid, const SCP_string& category)
-{
-	SCP_vector<SCP_string> list;
-
-	for (const auto& order : Lua_player_orders) {
-		if (order.second.generalOrder) {
-			bool add = false;
-
-			// All general orders
-			if (!onlyEnabled && !onlyValid && category.empty()) {
-				add = true;
-			} else {
-
-				// Only enabled orders
-				if (onlyEnabled && order.second.cur_enabled) {
-					add = true;
-
-					// Only valid orders
-				} else if (onlyValid && order.second.cur_valid) {
-					add = true;
-
-					// Only orders that match the category requested
-				} else if ((!category.empty()) && (order.second.category == category)) {
-					add = true;
-				}
-			}
-
-			if (add) {
-				list.push_back(order.second.parseText);
-			}
-		}
-	}
-
-	return list;
-}
-
-int ai_lua_find_general_order_id(const SCP_string& name) {
-	for (const auto& order : Lua_player_orders) {
-		if (order.second.parseText == name) {
-			return order.first;
-		}
-	}
-
-	return -1;
-}
-
-void ai_lua_enable_general_order(int sexp_op, bool enable) {
-	auto aiLuaOrder = Lua_player_orders.find(sexp_op);
-
-	if (aiLuaOrder == Lua_player_orders.end())
-		return;
-	else
-		aiLuaOrder->second.cur_enabled = enable;
-}
-
-void ai_lua_validate_general_order(int sexp_op, bool validity)
-{
-	auto aiLuaOrder = Lua_player_orders.find(sexp_op);
-
-	if (aiLuaOrder == Lua_player_orders.end())
-		return;
-	else
-		aiLuaOrder->second.cur_valid = validity;
-}
-
-void ai_lua_reset_general_orders() {
-	for (const auto& order : Lua_player_orders) {
-		ai_lua_enable_general_order(order.first, false);
-		ai_lua_validate_general_order(order.first, false);
-	}
-}
-
-bool ai_lua_is_general_order(int sexp_op) {
-	auto aiLuaOrder = Lua_player_orders.find(sexp_op);
-
-	if (aiLuaOrder == Lua_player_orders.end())
-		return false;
-
-	return aiLuaOrder->second.generalOrder;
-}
-
 void run_ai_lua_action(const luacpp::LuaFunction& action, const ai_mode_lua& lua_ai, ai_info* aip) {
 	if (!action.isValid()) {
 		Error(LOCATION,
@@ -190,11 +56,7 @@ void run_ai_lua_action(const luacpp::LuaFunction& action, const ai_mode_lua& lua
 	}

 	luacpp::LuaValueList luaParameters;
-	if (aip->shipnum >= 0){
-		luaParameters.push_back(luacpp::LuaValue::createValue(action.getLuaState(), scripting::api::l_AI_Helper.Set(object_h(&Objects[Ships[aip->shipnum].objnum]))));
-	} else {
-		luaParameters.push_back(luacpp::LuaValue::createValue(action.getLuaState(), scripting::api::l_AI_Helper.Set(object_h())));
-	}
+	luaParameters.push_back(luacpp::LuaValue::createValue(action.getLuaState(), scripting::api::l_AI_Helper.Set(object_h(&Objects[Ships[aip->shipnum].objnum]))));
 	if (lua_ai.needsTarget) {
 		luaParameters.push_back(luacpp::LuaValue::createValue(action.getLuaState(), scripting::api::l_OSWPT.Set(aip->lua_ai_target.target)));
 	}
@@ -205,13 +67,8 @@ void run_ai_lua_action(const luacpp::LuaFunction& action, const ai_mode_lua& lua
 	auto retVals = action.call(Script_system.GetLuaSession(), luaParameters);

 	if (!retVals.empty() && retVals[0].getValueType() == luacpp::ValueType::BOOLEAN) {
-		if (retVals[0].getValue<bool>()) {
-
-			// If we don't have a ship then it's a general order and we have nothing else to do
-			if (aip->shipnum >= 0) {
-				ai_mission_goal_complete(aip);
-			}
-		}
+		if (retVals[0].getValue<bool>())
+			ai_mission_goal_complete(aip);
 	}
 }

@@ -246,26 +103,6 @@ void ai_lua_start(ai_goal* aigp, object* objp){
 	run_ai_lua_action(action, lua_ai, aip);
 }

-// For sending general orders that don't run on a ship.
-// Essentially just runs arbitrary lua script when the command is called
-void ai_lua_start_general(int lua_sexp_id, int target_objnum)
-{
-	//Create a dummy aip to pass the target data
-	ai_info aip;
-	aip.shipnum = -1;
-
-	if (target_objnum >= 0 && Objects[target_objnum].type == OBJ_SHIP) {
-		aip.lua_ai_target = {object_ship_wing_point_team(&Ships[Objects[target_objnum].instance]), {}};
-	}
-	
-	const auto& lua_ai = ai_lua_find_mode(lua_sexp_id);
-
-	const auto& lua_ai_sexp = lua_ai->sexp;
-	const auto& action = lua_ai_sexp.getActionEnter();
-
-	run_ai_lua_action(action, *lua_ai, &aip);
-}
-
 bool ai_lua_is_valid_target_intrinsic(int sexp_op, int target_objnum, ship* self) {
 	ship* target = &Ships[Objects[target_objnum].instance];

@@ -349,24 +186,6 @@ bool ai_lua_is_valid_target(int sexp_op, int target_objnum, ship* self, size_t o
 	return ai_lua_is_valid_target_lua(mode, target_objnum, self);
 }

-bool ai_lua_is_valid_ship(int sexp_op, bool isWing, ship* self)
-{
-	const player_order_lua& order = *ai_lua_find_player_order(sexp_op);
-
-	switch (order.shipRestrictions) {
-	case player_order_lua::ship_restrictions::ANY:
-		return true;
-	case player_order_lua::ship_restrictions::WING:
-		return isWing;
-	case player_order_lua::ship_restrictions::IN_PLAYER_WING:
-		return self->wingnum != -1 && Ships[Player_obj->instance].wingnum == self->wingnum;
-	case player_order_lua::ship_restrictions::PLAYER_WING:
-		return isWing && self->wingnum != -1 && Ships[Player_obj->instance].wingnum == self->wingnum;
-	}
-
-	return false;
-}
-
 ai_achievability ai_lua_is_achievable(const ai_goal* aigp, int objnum){
 	const auto& lua_ai = Lua_ai_modes.at(aigp->ai_submode);

@@ -389,7 +208,7 @@ ai_achievability ai_lua_is_achievable(const ai_goal* aigp, int objnum){
 	if (!retVals.empty() && retVals[0].getValueType() == luacpp::ValueType::USERDATA) {
 		scripting::api::enum_h enumData;
 		retVals[0].getValue(scripting::api::l_Enum.Get(&enumData));
-		if (!enumData.isValid()) {
+		if (!enumData.IsValid()) {
 			Error(LOCATION, "LuaAI SEXP achievability hook returned an invalid avilability enum.");
 			return ai_achievability::ACHIEVABLE;
 		}
@@ -19,12 +19,7 @@ struct player_order_lua {
 	int ai_message = MESSAGE_YESSIR;
 	SCP_string parseText = "";
 	SCP_string displayText = "";
-	bool generalOrder = false;
-	SCP_string category = "";
-	bool cur_enabled = false;
-	bool cur_valid = false;
 	enum class target_restrictions : int { TARGET_ALLIES, TARGET_ALL, TARGET_OWN, TARGET_ENEMIES, TARGET_SAME_WING, TARGET_PLAYER_WING, TARGET_ALL_CAPS, TARGET_ALLIED_CAPS, TARGET_ENEMY_CAPS, TARGET_NOT_SELF } targetRestrictions = target_restrictions::TARGET_ALL;
-	enum class ship_restrictions : int { ANY, WING, IN_PLAYER_WING, PLAYER_WING } shipRestrictions = ship_restrictions::ANY;
 };


@@ -33,17 +28,7 @@ bool ai_lua_add_order(int sexp_op, player_order_lua order);
 bool ai_lua_has_mode(int sexp_op);
 const ai_mode_lua* ai_lua_find_mode(int sexp_op);
 const player_order_lua* ai_lua_find_player_order(int sexp_op);
-SCP_vector<SCP_string> ai_lua_get_general_order_categories(bool enabled_only = true);
-int ai_lua_get_num_general_orders();
-SCP_vector<SCP_string> ai_lua_get_general_orders(bool onlyEnabled = false, bool onlyValid = false, const SCP_string& category = "");
-int ai_lua_find_general_order_id(const SCP_string& name);
-void ai_lua_enable_general_order(int sexp_op, bool enable);
-void ai_lua_validate_general_order(int sexp_op, bool validity);
-void ai_lua_reset_general_orders();
-bool ai_lua_is_general_order(int sexp_op);
 void ai_lua(ai_info* aip);
 void ai_lua_start(ai_goal* aigp, object* objp);
-void ai_lua_start_general(int lua_sexp_id, int target_objnum);
 bool ai_lua_is_valid_target(int sexp_op, int target_objnum, ship* self, size_t order);
-bool ai_lua_is_valid_ship(int sexp_op, bool isWing, ship* self);
 ai_achievability ai_lua_is_achievable(const ai_goal* aigp, int objnum);
@@ -667,10 +667,12 @@ void anim_read_header(anim *ptr, CFILE *fp)
 * 
 * @param real_filename Filename of animation
 * @param cf_dir_type 
- *
- * @return Pointer to anim that is loaded if success, NULL if failure.
+ * @param file_mapped Whether to use memory-mapped file or not.
+ * 
+ * @details Memory-mapped files will page in the animation from disk as it is needed, but performance is not as good.
+ * @return Pointer to anim that is loaded if sucess, NULL if failure.
 */
-anim *anim_load(const char *real_filename, int cf_dir_type)
+anim *anim_load(const char *real_filename, int cf_dir_type, int file_mapped)
 {
 	anim			*ptr;
 	CFILE			*fp;
@@ -695,7 +697,7 @@ anim *anim_load(const char *real_filename, int cf_dir_type)
 	}

 	if (!ptr) {
-		fp = cfopen(name, "rb", cf_dir_type);
+		fp = cfopen(name, "rb", CFILE_NORMAL, cf_dir_type);
 		if ( !fp )
 			return NULL;

@@ -741,9 +743,18 @@ anim *anim_load(const char *real_filename, int cf_dir_type)

 		ptr->cfile_ptr = NULL;

-		// NOTE: mapped files no longer supported!!
-		ptr->flags |= ANF_STREAMED;
-		ptr->cfile_ptr = cfopen(name, "rb", cf_dir_type);
+		if ( file_mapped == PAGE_FROM_MEM) {
+			// Try mapping the file to memory 
+			ptr->flags |= ANF_MEM_MAPPED;
+			ptr->cfile_ptr = cfopen(name, "rb", CFILE_MEMORY_MAPPED, cf_dir_type);
+		}
+
+		// couldn't memory-map file... must be in a packfile, so stream manually
+		if ( file_mapped == PAGE_FROM_MEM && !ptr->cfile_ptr ) {
+			ptr->flags &= ~ANF_MEM_MAPPED;
+			ptr->flags |= ANF_STREAMED;
+			ptr->cfile_ptr = cfopen(name, "rb", CFILE_NORMAL, cf_dir_type);
+		}

 		ptr->cache = NULL;

@@ -38,6 +38,12 @@ typedef struct {
 	int ping_pong;
 } anim_play_struct;

+enum
+{
+	PAGE_FROM_DISK		  = 0,
+	PAGE_FROM_MEM		  = 1
+};
+
 extern int Anim_paused;

 void				anim_init();
@@ -51,7 +57,7 @@ void				anim_ignore_next_frametime();
 int				anim_show_next_frame(anim_instance *instance, float frametime);
 void				anim_release_all_instances(int screen_id = 0);
 void				anim_release_render_instance(anim_instance* instance);
-anim			  *anim_load(const char *name, int cf_dir_type = CF_TYPE_ANY);
+anim			  *anim_load(const char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_DISK);
 int				anim_free(anim *ptr);
 void				anim_read_header(anim *ptr, CFILE *fp);
 void				anim_reverse_direction(anim_instance *ai);						// called automatically for ping-ponging, and can also be called externally
@@ -22,19 +22,19 @@ anim_instance *init_anim_instance(anim *ptr, int bpp)
 {
 	anim_instance *inst;

-	Assertion(ptr, "Bad pointer in init_anim_instance(), please report to the SCP!");
 	if (!ptr) {
+		Int3();
 		return NULL;
 	}

 	if ( ptr->flags & ANF_STREAMED ) {
-		Assertion(ptr->file_offset > -1, "Bad file offset of %d in init_anim_instance(), please report to the SCP!", ptr->file_offset);
 		if ( ptr->file_offset < 0 ) {
+			Int3();
 			return NULL;
 		}
 	} else {
-		Assertion(ptr->data, "Bad data in init_anim_instance(), please report to the SCP!");
 		if ( !ptr->data ) {
+			Int3();
 			return NULL;
 		}
 	}
@@ -14,7 +14,6 @@

 #include "globalincs/globals.h"		// for NAME_LENGTH
 #include "globalincs/pstypes.h"
-#include "object/object_flags.h"
 #include "io/timer.h"

 class object;
@@ -25,14 +24,15 @@ class model_draw_list;
 #define	MAX_ASTEROIDS			2000	//Increased from 512 to 2000 in 2022

 #define	NUM_ASTEROID_SIZES		3
+#define	NUM_ASTEROID_POFS		3				// Number of POFs per debris size

 #define	ASTEROID_TYPE_DEBRIS    -1
 #define	ASTEROID_TYPE_SMALL		0
 #define	ASTEROID_TYPE_MEDIUM	1
 #define	ASTEROID_TYPE_LARGE		2

-// Only used for parsing & saving retail compatible mission files
-#define	MAX_RETAIL_DEBRIS_TYPES		3
+// these should always be equal for the benefit of generic asteroids (c.f. asteroid_page_in)
+#define	MAX_ACTIVE_DEBRIS_TYPES		NUM_ASTEROID_SIZES

 // Goober5000 - currently same as MAX_SHIP_DETAIL_LEVELS (put here to avoid an #include)
 #define MAX_ASTEROID_DETAIL_LEVELS	5
@@ -54,22 +54,15 @@ typedef struct asteroid_split_info {
 	int		max;				//maximum asteroids to spawn
 } asteroid_split_info;

-// Data structure for storing asteroid subtype info. POFs, model pointer, model num, etc.
-typedef struct asteroid_subtype_info {
-	char        pof_filename[MAX_FILENAME_LEN];
-	int         model_number;
-	SCP_string  type_name;
-} asteroid_subtype_info;
-
 class asteroid_info
 {
 public:
 	char		name[NAME_LENGTH];								// name for the asteroid
 	int			type;											// type of asteroid, 0 = small, 1 = medium, 2 = large, -1 = debris
-	int			num_detail_levels;								// number of detail levels for this asteroid
+	char		pof_files[NUM_ASTEROID_POFS][MAX_FILENAME_LEN];	// POF files to load/associate with ship
+	int			num_detail_levels;								// number of detail levels for this ship
 	int			detail_distance[MAX_ASTEROID_DETAIL_LEVELS];	// distance to change detail levels at
 	float		max_speed;										// cap on speed for asteroid
-	float		rotational_vel_multiplier;						// rotational velocity multiplier for asteroid --wookieejedi
 	int			damage_type_idx;								//Damage type of the asteroid
 	int			damage_type_idx_sav;							// stored value from table used to reset damage_type_idx
 	float		inner_rad;										// radius within which maximum area effect damage is applied
@@ -78,16 +71,16 @@ public:
 	float		blast;											// maximum blast impulse from area effect explosion
 	float		initial_asteroid_strength;						// starting strength of asteroid
 	SCP_vector< asteroid_split_info > split_info;
+	polymodel	*modelp[NUM_ASTEROID_POFS];
+	int			model_num[NUM_ASTEROID_POFS];
 	SCP_vector<int> explosion_bitmap_anims;
 	float		fireball_radius_multiplier;						// the model radius is multiplied by this to determine the fireball size
-	SCP_string	display_name;									// only used for hud targeting display and for debris
-	float		spawn_weight;									// debris only, relative proportion to spawn compared to other types in its asteroid field
+	SCP_string	display_name;									// only used for hud targeting display and for 'ship' asteroids
+	float		spawn_weight;									// ship asteroids only, relative proportion to spawn compared to other types in its asteroid field
 	float		gravity_const;									// multiplier for mission gravity
-	SCP_vector<asteroid_subtype_info> subtypes;

 	asteroid_info( )
-		: type(ASTEROID_TYPE_DEBRIS), num_detail_levels(0), max_speed(0), 
-		  rotational_vel_multiplier(1), damage_type_idx(0),
+		: type(ASTEROID_TYPE_DEBRIS), num_detail_levels(0), max_speed(0), damage_type_idx(0),
 		  damage_type_idx_sav( -1 ), inner_rad( 0 ), outer_rad( 0 ),
 		  damage( 0 ), blast( 0 ), initial_asteroid_strength( 0 ),
 		  fireball_radius_multiplier( -1 ), spawn_weight( 1 ), gravity_const( 0 )
@@ -95,6 +88,13 @@ public:
 		name[ 0 ] = 0;
 		display_name = "";
 		memset( detail_distance, 0, sizeof( detail_distance ) );
+
+		for (int i = 0; i < NUM_ASTEROID_POFS; i++)
+		{
+			modelp[i] = NULL;
+			model_num[i] = -1;
+			pof_files[i][0] = '\0';
+		}
 	}
 };

@@ -103,7 +103,6 @@ public:

 typedef	struct asteroid {
 	int		flags;
-	flagset<Object::Raw_Pof_Flags> render_flags; // Render flags
 	int		objnum;
 	int		model_instance_num;
 	int		asteroid_type;		// 0..MAX_DEBRIS_TYPES
@@ -142,9 +141,8 @@ typedef	struct asteroid_field {
 	int		num_initial_asteroids;		// Number of asteroids at creation.
 	field_type_t		field_type;		// active throws and wraps, passive does not
 	debris_genre_t	debris_genre;		// type of debris (ship or asteroid)  [generic type]
-	SCP_vector<int>	field_debris_type;	// one of the debris type defines above
-	SCP_vector<SCP_string> field_asteroid_type; // one of the asteroid subtypes
-	bool            enhanced_visibility_checks;     // if true then range checks are overridden for spawning and wrapping asteroids in the field
+	int				field_debris_type[MAX_ACTIVE_DEBRIS_TYPES];	// one of the debris type defines above
+	int				num_used_field_debris_types;	// how many of the above are used

 	SCP_vector<SCP_string> target_names;	// default retail behavior is to just throw at the first big ship in the field
 } asteroid_field;
@@ -160,32 +158,24 @@ extern vec3d	Asteroid_icon_closeup_position;  // closeup position for asteroid f
 extern float	Asteroid_icon_closeup_zoom;		 // zoom position for asteroid field briefing icon rendering

 void	asteroid_init();
-bool    asteroid_is_within_view(vec3d *pos, float range, bool range_override = false);
 void	asteroid_level_init();
 void	asteroid_level_close();
 void	asteroid_create_all();
-void	asteroid_create_asteroid_field(int num_asteroids, int field_type, int asteroid_speed, vec3d o_min, vec3d o_max, bool inner_box, vec3d i_min, vec3d i_max, SCP_vector<SCP_string> asteroid_types);
-void	asteroid_create_debris_field(int num_asteroids, int asteroid_speed, SCP_vector<int> debris_types, vec3d o_min, vec3d o_max, bool enhanced);
+void	asteroid_create_asteroid_field(int num_asteroids, int field_type, int asteroid_speed, bool brown, bool blue, bool orange, vec3d o_min, vec3d o_max, bool inner_box, vec3d i_min, vec3d i_max, SCP_vector<SCP_string> targets);
+void	asteroid_create_debris_field(int num_asteroids, int asteroid_speed, int debris1, int debris2, int debris3, vec3d o_min, vec3d o_max);
 void	asteroid_render(object* obj, model_draw_list* scene);
 void	asteroid_delete( object *asteroid_objp );
 void	asteroid_process_pre( object *asteroid_objp );
 void	asteroid_process_post( object *asteroid_objp);
 int	asteroid_check_collision( object *asteroid_objp, object * other_obj, vec3d * hitpos, collision_info_struct *asteroid_hit_info=NULL, vec3d* hitnormal=NULL );
-void	asteroid_hit( object *pasteroid_objp, object *other_objp, vec3d *hitpos, float damage, vec3d* force );
+void	asteroid_hit( object *pasteroid_objp, object *other_objp, vec3d *hitpos, float damage );
 int	asteroid_count();
 int	asteroid_collide_objnum(object *asteroid_objp);
 float asteroid_time_to_impact(object *asteroid_objp);
 void	asteroid_show_brackets();
 void	asteroid_target_closest_danger();
 void asteroid_add_target(object* objp);
-int get_asteroid_index(const char* asteroid_name);
-SCP_vector<SCP_string> get_list_valid_asteroid_subtypes();
-
-// extern for the lab
-void asteroid_load(int asteroid_info_index, int asteroid_subtype);
-
-// need to extern for keycontrol debug commands
-object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroid_subtype, bool check_visibility = false);
+int get_asteroid_position(const char* name);

 // need to extern for multiplayer
 void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec);
@@ -30,7 +30,7 @@
 #include <map>

 // Extern functions/variables
-extern bool Player_use_ai;
+extern int		Player_use_ai;
 extern int get_wing_index(object *objp, int wingnum);
 extern object * get_wing_leader(int wingnum);
 extern int Cmdline_autopilot_interruptable;
@@ -66,7 +66,7 @@ int start_dist;
 void autopilot_ai_waypoint_goal_fixup(ai_goal* aigp)
 {
 	// this function sets wp_index properly;
-	aigp->wp_list_index = find_matching_waypoint_list_index(aigp->target_name);
+	aigp->wp_list = find_matching_waypoint_list(aigp->target_name);
 }


@@ -111,15 +111,13 @@ const vec3d *NavPoint::GetPosition()
 {
 	if (flags & NP_WAYPOINT)
 	{
-		auto wpt = find_waypoint_at_indexes(target_index, waypoint_num-1);
-		Assert(wpt != nullptr);
-		if (wpt == nullptr)
-			return &vmd_zero_vector;
+		waypoint *wpt = find_waypoint_at_index((waypoint_list*) target_obj, waypoint_num-1);
+		Assert(wpt != NULL);
 		return wpt->get_pos();
 	}
 	else
 	{
-		return &Objects[target_index].pos;
+		return &Objects[((ship*) target_obj)->objnum].pos;
 	}
 }

@@ -241,7 +239,7 @@ bool StartAutopilot()
 			// is support ship trying to rearm-repair
 			if ( ai_find_goal_index( support_ship_aip->goals, AI_GOAL_REARM_REPAIR ) == -1 ) {
 				// no, so tell it to depart
-				ai_add_ship_goal_player( ai_goal_type::PLAYER_SHIP, AI_GOAL_WARP, -1, nullptr, support_ship_aip );
+				ai_add_ship_goal_player( AIG_TYPE_PLAYER_SHIP, AI_GOAL_WARP, -1, NULL, support_ship_aip );
 			} else {
 				// yes
 				send_autopilot_msgID(NP_MSG_FAIL_SUPPORT_WORKING);
@@ -270,7 +268,7 @@ bool StartAutopilot()
 		LockAPConv = _timestamp(); // lock convergence instantly
 	else
 		LockAPConv = _timestamp(3 * MILLISECONDS_PER_SECOND); // 3 seconds before we lock convergence
-	Player_use_ai = true;
+	Player_use_ai = 1;
 	set_time_compression(1);
 	lock_time_compression(true);

@@ -300,16 +298,15 @@ bool StartAutopilot()
 	autopilot_wings.clear();

 	// vars for usage w/ cinematic
-	vec3d pos, perp, tpos, rpos = Player_obj->pos, zero;
+	vec3d pos, norm1, perp, tpos, rpos = Player_obj->pos, zero;
 	memset(&zero, 0, sizeof(vec3d));


 	// instantly turn player toward tpos
 	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
 	{
-		vec3d norm1;
-		vm_vec_normalized_dir(&norm1, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
-		vm_vector_2_matrix_norm(&Player_obj->orient, &norm1, nullptr, nullptr);
+		vm_vec_sub(&norm1, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
+		vm_vector_2_matrix(&Player_obj->orient, &norm1, NULL, NULL);
 	}

 	for (i = 0; i < MAX_SHIPS; i++)
@@ -396,12 +393,10 @@ bool StartAutopilot()
 				radius = Objects[Ships[i].objnum].radius;
 			}

-			// instantly turn the ship to match the direction player is looking
 			if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
-			{
-				vec3d norm1;
-				vm_vec_normalized_dir(&norm1, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
-				vm_vector_2_matrix_norm(&Objects[Ships[i].objnum].orient, &norm1, nullptr, nullptr);
+			{// instantly turn the ship to match the direction player is looking
+				//vm_vec_sub(&norm1, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
+				vm_vector_2_matrix(&Objects[Ships[i].objnum].orient, &norm1, NULL, NULL);
 			}

 			// snap wings into formation
@@ -467,12 +462,12 @@ bool StartAutopilot()
 			{ 
 				if (Navs[CurrentNav].flags & NP_WAYPOINT)
 				{
-					ai_add_ship_goal_player( ai_goal_type::PLAYER_SHIP, AI_GOAL_WAYPOINTS_ONCE, 0, Waypoint_lists[Navs[CurrentNav].target_index].get_name(), &Ai_info[Ships[i].ai_index] );
+					ai_add_ship_goal_player( AIG_TYPE_PLAYER_SHIP, AI_GOAL_WAYPOINTS_ONCE, 0, ((waypoint_list*)Navs[CurrentNav].target_obj)->get_name(), &Ai_info[Ships[i].ai_index] );
 					//fixup has to wait until after wing goals
 				}
 				else
 				{
-					ai_add_ship_goal_player( ai_goal_type::PLAYER_SHIP, AI_GOAL_FLY_TO_SHIP, 0, Ships[Objects[Navs[CurrentNav].target_index].instance].ship_name, &Ai_info[Ships[i].ai_index] );
+					ai_add_ship_goal_player( AIG_TYPE_PLAYER_SHIP, AI_GOAL_FLY_TO_SHIP, 0, ((ship*)Navs[CurrentNav].target_obj)->ship_name, &Ai_info[Ships[i].ai_index] );
 				}

 			}
@@ -488,15 +483,15 @@ bool StartAutopilot()
 			{	
 				//ai_add_ship_goal_player( int type, int mode, int submode, char *shipname, ai_info *aip );

-				//ai_add_wing_goal_player( ai_goal_type::PLAYER_WING, AI_GOAL_STAY_NEAR_SHIP, 0, target_shipname, wingnum );
-				//ai_add_wing_goal_player( ai_goal_type::PLAYER_WING, AI_GOAL_WAYPOINTS_ONCE, 0, target_shipname, wingnum );
+				//ai_add_wing_goal_player( AIG_TYPE_PLAYER_WING, AI_GOAL_STAY_NEAR_SHIP, 0, target_shipname, wingnum );
+				//ai_add_wing_goal_player( AIG_TYPE_PLAYER_WING, AI_GOAL_WAYPOINTS_ONCE, 0, target_shipname, wingnum );
 				//ai_clear_ship_goals( &(Ai_info[Ships[num].ai_index]) );
 				
 				ai_clear_wing_goals( &Wings[i] );
 				if (Navs[CurrentNav].flags & NP_WAYPOINT)
 				{
 					
-					ai_add_wing_goal_player( ai_goal_type::PLAYER_WING, AI_GOAL_WAYPOINTS_ONCE, 0, Waypoint_lists[Navs[CurrentNav].target_index].get_name(), i );
+					ai_add_wing_goal_player( AIG_TYPE_PLAYER_WING, AI_GOAL_WAYPOINTS_ONCE, 0, ((waypoint_list*)Navs[CurrentNav].target_obj)->get_name(), i );

 					// "fix up" the goal
 					for (j = 0; j < MAX_AI_GOALS; j++)
@@ -510,7 +505,7 @@ bool StartAutopilot()
 				}
 				else
 				{
-					ai_add_wing_goal_player( ai_goal_type::PLAYER_WING, AI_GOAL_FLY_TO_SHIP, 0, Ships[Objects[Navs[CurrentNav].target_index].instance].ship_name, i );
+					ai_add_wing_goal_player( AIG_TYPE_PLAYER_WING, AI_GOAL_FLY_TO_SHIP, 0, ((ship*)Navs[CurrentNav].target_obj)->ship_name, i );

 				}
 			}
@@ -858,7 +853,7 @@ void EndAutoPilot()

 	set_time_compression(1);
 	lock_time_compression(false);
-	Player_use_ai = false;
+	Player_use_ai = 0;
 	//Clear AI Goals

 	if (CinematicStarted) // clear cinematic if we need to
@@ -874,17 +869,17 @@ void EndAutoPilot()
 	Assert( CurrentNav >= 0 );

 	int goal = 0;
-	const char *goal_name = NULL;
+	char *goal_name = NULL;

 	if (Navs[CurrentNav].flags & NP_WAYPOINT)
 	{
 		goal = AI_GOAL_WAYPOINTS_ONCE;
-		goal_name = Waypoint_lists[Navs[CurrentNav].target_index].get_name();
+		goal_name = ((waypoint_list*)Navs[CurrentNav].target_obj)->get_name();
 	}
 	else
 	{
 		goal = AI_GOAL_FLY_TO_SHIP;
-		goal_name = Ships[Objects[Navs[CurrentNav].target_index].instance].ship_name;
+		goal_name = ((ship*)Navs[CurrentNav].target_obj)->ship_name;
 	}

 	// assign ship goals
@@ -1016,7 +1011,7 @@ void nav_warp(bool prewarp=false)
 	vm_vec_scale(&velocity, (float)Ai_info[Ships[Autopilot_flight_leader->instance].ai_index].waypoint_speed_cap);

 	// Find all ships that are supposed to autopilot with the player and move them
-	// to the cinematic location or the final destination
+	// to the cinimatic location or the final destination
 	for (int i = 0; i < MAX_SHIPS; i++)
 	{
 		if (Ships[i].objnum != -1
@@ -1025,12 +1020,11 @@ void nav_warp(bool prewarp=false)
 		{
 				vm_vec_add(&Objects[Ships[i].objnum].pos, &Objects[Ships[i].objnum].pos, &targetPos);
 				Objects[Ships[i].objnum].phys_info.vel = velocity;
-
-				// retime collision pairs
-				if (Objects[Ships[i].objnum].flags[Object::Object_Flags::Collides])
-					obj_collide_obj_cache_stale(&Objects[Ships[i].objnum]);
 		}
 	}
+
+	// retime all collision pairs
+	obj_collide_retime_cached_pairs();
 }

 // ********************************************************************************************
@@ -1099,9 +1093,9 @@ void NavSystem_Do()

 		for (i = 0; i < MAX_NAVPOINTS; i++)
 		{
-			if ((Navs[i].flags & NP_SHIP) && (Navs[i].target_index >= 0))
+			if ((Navs[i].flags & NP_SHIP) && (Navs[i].target_obj != NULL))
 			{
-				if (Objects[Navs[i].target_index].flags[Object::Object_Flags::Should_be_dead])
+				if (((ship*)Navs[i].target_obj)->objnum == -1)
 				{
 					if (CurrentNav == i)
 						CurrentNav = -1;
@@ -1113,7 +1107,7 @@ void NavSystem_Do()
 		// check if we're reached a Node
 		for (i = 0; i < MAX_NAVPOINTS; i++)
 		{
-			if (Navs[i].target_index >= 0)
+			if (Navs[i].target_obj != NULL)
 			{
 				if (Navs[i].flags & NP_VALIDTYPE && DistanceTo(i) < 1000)
 					Navs[i].flags |= NP_VISITED;
@@ -1189,10 +1183,6 @@ void send_autopilot_msgID(int msgid)
 	if (msgid < 0 || msgid >= NP_NUM_MESSAGES)
 		return;

-	// bail out if message is not set
-	if (NavMsgs[msgid].message[0] == '\0')
-		return;
-
 	send_autopilot_msg(NavMsgs[msgid].message, NavMsgs[msgid].filename);
 }
 // ********************************************************************************************
@@ -1232,15 +1222,6 @@ void NavSystem_Init()
 	for (int i = 0; i < MAX_NAVPOINTS; i++)
 		Navs[i].clear();

-	//Initialize all these as empty strings so we can detect and bail out later -Mjn
-	for (int i = 0; i < NP_NUM_MESSAGES; i++)
-		NavMsgs[i].message[0] = '\0';
-
-	//Set defaults here before parsing
-	NavLinkDistance = 1000;
-	AutopilotMinEnemyDistance = 5000;
-	AutopilotMinAsteroidDistance = 1000;
-	LockWeaponsDuringAutopilot = false;
 	AutoPilotEngaged = false;
 	CurrentNav = -1;
 	audio_handle = -1;
@@ -1248,9 +1229,10 @@ void NavSystem_Init()
 	UseCutsceneBars = true;

 	// defaults... can be tabled or bound to mission later
-	parse_autopilot_table("autopilot.tbl");
-	
-	parse_modular_table("*-aplt.tbm", parse_autopilot_table);
+	if (cf_exists_full("autopilot.tbl", CF_TYPE_TABLES))
+		parse_autopilot_table("autopilot.tbl");
+	else
+		parse_autopilot_table(NULL);
 }

 // ********************************************************************************************
@@ -1261,16 +1243,10 @@ void parse_autopilot_table(const char *filename)

 	try
 	{
-
-		if (!Parsing_modular_table) {
-			// if table doesn't exist, use the default table
-			if (cf_exists_full(filename, CF_TYPE_TABLES))
-				read_file_text(filename, CF_TYPE_TABLES);
-			else
-				read_file_text_from_default(defaults_get_file("autopilot.tbl"));
-		} else {
+		if (filename == NULL)
+			read_file_text_from_default(defaults_get_file("autopilot.tbl"));
+		else
 			read_file_text(filename, CF_TYPE_TABLES);
-		}

 		reset_parse();

@@ -1278,17 +1254,23 @@ void parse_autopilot_table(const char *filename)
 		required_string("#Autopilot");

 		// autopilot link distance
-		if (optional_string("$Link Distance:"))
-			stuff_int(&NavLinkDistance);
+		required_string("$Link Distance:");
+		stuff_int(&NavLinkDistance);

 		if (optional_string("$Interrupt autopilot if enemy within distance:"))
 			stuff_int(&AutopilotMinEnemyDistance);
+		else
+			AutopilotMinEnemyDistance = 5000;

 		if (optional_string("$Interrupt autopilot if asteroid within distance:"))
 			stuff_int(&AutopilotMinAsteroidDistance);
+		else
+			AutopilotMinAsteroidDistance = 1000;

 		if (optional_string("$Lock Weapons During Autopilot:"))
 			stuff_boolean(&LockWeaponsDuringAutopilot);
+		else
+			LockWeaponsDuringAutopilot = false;

 		// optional no cutscene bars
 		if (optional_string("+No_Cutscene_Bars"))
@@ -1303,14 +1285,13 @@ void parse_autopilot_table(const char *filename)
 			"$Support Present:", "$Support Working:" };
 		for (int i = 0; i < NP_NUM_MESSAGES; i++)
 		{
-			if (optional_string(msg_tags[i])) {
+			required_string(msg_tags[i]);

-				required_string("+Msg:");
-				stuff_string(NavMsgs[i].message, F_MESSAGE, 256);
+			required_string("+Msg:");
+			stuff_string(NavMsgs[i].message, F_MESSAGE, 256);

-				required_string("+Snd File:");
-				stuff_string(NavMsgs[i].filename, F_NAME, 256);
-			}
+			required_string("+Snd File:");
+			stuff_string(NavMsgs[i].filename, F_NAME, 256);
 		}


@@ -1397,7 +1378,7 @@ bool AddNav_Ship(const char *Nav, const char *TargetName, int flags)
 	{
 		if (Ships[i].objnum != -1 && !stricmp(TargetName, Ships[i].ship_name))
 		{
-			tnav.target_index = Ships[i].objnum;
+			tnav.target_obj = (void *)&Ships[i];		
 		}
 	}

@@ -1438,7 +1419,7 @@ bool AddNav_Waypoint(const char *Nav, const char *WP_Path, int node, int flags)

 	Assert(!(tnav.flags & NP_SHIP));

-	tnav.target_index = find_matching_waypoint_list_index(WP_Path);
+	tnav.target_obj = find_matching_waypoint_list(WP_Path);
 	tnav.waypoint_num = node;

 	// copy it into it's location
@@ -34,7 +34,7 @@ public:
 	ubyte normal_color[3] = { 0x80, 0x80, 0xFF };
 	ubyte visited_color[3] = { 0xFF, 0xFF, 0x00 };

-	int target_index = -1; //waypoint list index if NP_WAYPOINT, otherwise object index
+	const void *target_obj = nullptr;
 	int waypoint_num = -1; //only used when flags & NP_WAYPOINT

 	const vec3d *GetPosition();
@@ -53,7 +53,7 @@ public:
 		visited_color[1] = 0xFF;
 		visited_color[2] = 0x00;

-		target_index = -1;
+		target_obj = nullptr;
 		waypoint_num = -1;
 	}
 };
@@ -100,7 +100,7 @@ void bm_lock_apng( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort fla
 void bm_lock_jpg( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags );
 void bm_lock_pcx( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags );
 void bm_lock_tga( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags );
-void bm_lock_user( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags, bool convert = true );
+void bm_lock_user( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags );

 const size_t BM_BLOCK_SIZE = 4096;

@@ -425,7 +425,6 @@ DCF(bm_used, "Shows BmpMan Slot Usage") {

 	SCP_stringstream text;
 	text << "BmpMan Used Slots\n";
-	text << "  " << std::dec << std::setw(4) << std::setfill('0') << none << ", NONE\n";
 	text << "  " << std::dec << std::setw(4) << std::setfill('0') << pcx  << ", PCX\n";
 	text << "  " << std::dec << std::setw(4) << std::setfill('0') << user << ", User\n";
 	text << "  " << std::dec << std::setw(4) << std::setfill('0') << tga  << ", TGA\n";
@@ -586,59 +585,6 @@ int bm_create(int bpp, int w, int h, void *data, int flags) {
 	return n;
 }

-int bm_create_3d(int bpp, int w, int h, int d, void* data) {
-	Assert((bpp == 16) || (bpp == 24) || (bpp == 32));
-	
-	Assertion(bm_inited, "bmpman must be initialized before this function can be called!");
-
-	int n = find_block_of(1);
-
-	// Out of bitmap slots
-	if (n == -1)
-		return -1;
-
-	// make sure that we have valid data
-	if (data == nullptr) {
-		UNREACHABLE("No valid data received for 3D Bitmap creation!");
-		return -1;
-	}
-
-	auto entry = bm_get_entry(n);
-
-	memset(entry, 0, sizeof(bitmap_entry));
-
-	sprintf_safe(entry->filename, "TMP%dx%dx%d+%d", w, h, d, bpp);
-	entry->type = BM_TYPE_3D;
-	entry->comp_type = BM_TYPE_NONE;
-
-	entry->bm.w = (short)w;
-	entry->bm.h = (short)h;
-	entry->bm.d = (short)d;
-	entry->bm.rowsize = (short)w;
-	entry->bm.bpp = (ubyte)bpp;
-	entry->bm.true_bpp = (ubyte)bpp;
-	entry->bm.flags = (ubyte)BMP_TEX_XPARENT;
-	entry->bm.data = 0;
-	entry->bm.palette = nullptr;
-
-	entry->info.user.bpp = (ubyte)bpp;
-	entry->info.user.data = data;
-	entry->info.user.flags = (ubyte)BMP_TEX_XPARENT;
-
-	entry->signature = Bm_next_signature++;
-
-	entry->handle = n;
-	entry->mem_taken = (w * h * d * (bpp >> 3));
-
-	entry->load_count++;
-
-	bm_update_memory_used(n, (int)entry->mem_taken);
-
-	gr_bm_create(bm_get_slot(n));
-
-	return n;
-}
-
 void bm_convert_format(bitmap *bmp, ushort flags) {
 	int idx;

@@ -682,7 +628,7 @@ void bm_free_data(bitmap_slot* bs, bool release)

 	// Don't free up memory for user defined bitmaps, since
 	// BmpMan isn't the one in charge of allocating/deallocing them.
-	if (be->type == BM_TYPE_USER || be->type == BM_TYPE_3D) {
+	if (be->type==BM_TYPE_USER) {
 #ifdef BMPMAN_NDEBUG
 		if ( be->data_size != 0 )
 			bm_texture_ram -= be->data_size;
@@ -738,7 +684,7 @@ void bm_free_data_fast(int handle)

 	// Don't free up memory for user defined bitmaps, since
 	// BmpMan isn't the one in charge of allocating/deallocing them.
-	if (be->type == BM_TYPE_USER || be->type == BM_TYPE_3D) {
+	if (be->type == BM_TYPE_USER) {
 #ifdef BMPMAN_NDEBUG
 		if ( be->data_size != 0 )
 			bm_texture_ram -= be->data_size;
@@ -946,27 +892,6 @@ int bm_get_info(int handle, int *w, int * h, ushort* flags, int *nframes, int *f
 	}
 }

-int bm_get_depth(int handle, int* depth) {
-	bitmap* bmp;
-
-	if (!bm_inited) return -1;
-
-	auto entry = bm_get_entry(handle);
-
-	Assertion(entry->handle == handle, "Invalid bitmap handle %d passed to bm_get_info().\nThis might be due to an invalid animation somewhere else.\n", handle);		// INVALID BITMAP HANDLE!
-
-	if (entry->type != BM_TYPE_3D) {
-		*depth = 0;
-		return -1;
-	}
-
-	bmp = &(entry->bm);
-
-	*depth = bmp->d;
-
-	return handle;
-}
-
 int bm_get_num_mipmaps(int num) {
 	auto entry = bm_get_entry(num);

@@ -1027,6 +952,10 @@ int bm_is_compressed(int num) {
 	auto entry = bm_get_entry(num);
 	BM_TYPE type = BM_TYPE_NONE;

+	//duh
+	if (!Use_compressed_textures)
+		return 0;
+
 	type = entry->comp_type;

 	switch (type) {
@@ -1478,10 +1407,6 @@ static int bm_load_image_data(int handle, int bpp, ushort flags, bool nodebug)
 			bm_lock_user(handle, bs, bmp, true_bpp, flags);
 			break;

-		case BM_TYPE_3D:
-			bm_lock_user(handle, bs, bmp, true_bpp, flags, false);
-			break;
-
 		default:
 			Warning(LOCATION, "Unsupported type in bm_lock -- %d\n", c_type);
 			return -1;
@@ -1592,13 +1517,10 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke
 	// MAX_FILENAME_LEN-10 == 5 character frame designator plus '.' plus 3 letter ext plus NULL terminator
 	// we only check for -5 here since the filename should already have the extension on it, and it must have passed the previous check
 	if (strlen(filename) > MAX_FILENAME_LEN - 5) {
-		// Don't check PNGs yet, because a PNG could be a regular non-animated image
-		if (type != BM_TYPE_PNG) {
-			Warning(LOCATION, "Passed filename, '%s', is too long to support an extension and frames!!\n\nMaximum length for an ANI/EFF/APNG, minus the extension, is %i characters.\n", filename, MAX_FILENAME_LEN - 10);
-			if (img_cfp != nullptr)
-				cfclose(img_cfp);
-			return -1;
-		}
+		Warning(LOCATION, "Passed filename, '%s', is too long to support an extension and frames!!\n\nMaximum length for an ANI/EFF/APNG, minus the extension, is %i characters.\n", filename, MAX_FILENAME_LEN - 10);
+		if (img_cfp != nullptr)
+			cfclose(img_cfp);
+		return -1;
 	}

 	// it's an effect file, any readable image type with eff being txt
@@ -1682,14 +1604,6 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke
 				return -1;
 			}
 		}
-
-		// Now do the same filename length check that was deferred for PNGs above
-		if (strlen(filename) > MAX_FILENAME_LEN - 5) {
-			Warning(LOCATION, "Passed filename, '%s', is too long to support an extension and frames!!\n\nMaximum length for an ANI/EFF/APNG, minus the extension, is %i characters.\n", filename, MAX_FILENAME_LEN - 10);
-			if (img_cfp != nullptr)
-				cfclose(img_cfp);
-			return -1;
-		}
 	}
 	else {
 		Warning(LOCATION, "Unsupported image type: %i", type);
@@ -2474,7 +2388,7 @@ void bm_lock_tga(int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags
 	bm_convert_format(bmp, flags);
 }

-void bm_lock_user(int /*handle*/, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags, bool convert) {
+void bm_lock_user(int /*handle*/, bitmap_slot *bs, bitmap *bmp, int bpp, ushort flags) {
 	auto be = &bs->entry;

 	// Unload any existing data
@@ -2514,8 +2428,7 @@ void bm_lock_user(int /*handle*/, bitmap_slot *bs, bitmap *bmp, int bpp, ushort
 		break;
 	}

-	if (convert)
-		bm_convert_format(bmp, flags);
+	bm_convert_format(bmp, flags);
 }

 int bm_make_render_target(int width, int height, int flags) {
@@ -2599,7 +2512,7 @@ void *bm_malloc(int n, size_t size) {
 void bm_page_in_aabitmap(int handle, int nframes) {
 	int i;

-	if (handle < 0)
+	if (handle == -1)
 		return;

 	Assert(bm_get_entry(handle)->handle == handle);
@@ -3218,7 +3131,7 @@ int bm_unload_fast(int handle, int clear_render_targets) {
 		return -1;		// Already been released
 	}

-	if (be->type == BM_TYPE_USER || be->type == BM_TYPE_3D) {
+	if (be->type == BM_TYPE_USER) {
 		return -1;
 	}

@@ -79,9 +79,7 @@ enum BM_TYPE
 	BM_TYPE_CUBEMAP_DDS,    //!< generic DDS cubemap (uncompressed cubemap surface)
 	BM_TYPE_CUBEMAP_DXT1,   //!< 24-bit cubemap        (compressed cubemap surface)
 	BM_TYPE_CUBEMAP_DXT3,   //!< 32-bit cubemap        (compressed cubemap surface)
-	BM_TYPE_CUBEMAP_DXT5,    //!< 32-bit cubemap        (compressed cubemap surface)
-
-	BM_TYPE_3D				//!< 3D in-memory
+	BM_TYPE_CUBEMAP_DXT5    //!< 32-bit cubemap        (compressed cubemap surface)
 };

 /**
@@ -92,7 +90,6 @@ struct bitmap
 {
 	short	w;          //!< Width, in number of pixels
 	short	h;          //!< Height, in number of pixels
-	short	d;			//!< Depth, in number of pixels
 	short	rowsize;    //!< What you need to add to go to next row
 	int	bpp;        //!< Requested bitdepth of each pixel. ( 7, 8, 15, 16, 24, 32)
 	int	true_bpp;   //!< The image's actual bitdepth
@@ -220,19 +217,6 @@ int bm_load_duplicate(const char *filename);
 */
 int bm_create(int bpp, int w, int h, void *data = NULL, int flags = 0);

-/**
- * Loads a 3D bitmap which exists somewhere in the RAM.
- *
- * @param bpp The bitdepth of the bitmap
- * @param w The width of the bitmap
- * @param h The height of the bitmap
- * @param d The depth of the bitmap
- * @param[in] data The bitmap's data glob
- *
- * @note The used RAM cannot be freed until bm_release is called on the created bitmap
- */
-int bm_create_3d(int bpp, int w, int h, int d, void* data = nullptr);
-
 /**
 * @brief Unloads a bitmap's data, but not the bitmap info
 *
@@ -389,16 +373,6 @@ int bm_is_valid(int handle);
 */
 int bm_get_info(int handle, int *w = nullptr, int * h = nullptr, ushort* flags = nullptr, int *nframes = nullptr, int *fps = nullptr);

-/**
- * @brief Gets 3D info on the bitmap indexed by handle.
- *
- * @param[out] depth      If non-null, gets the depth
- *
- * @returns The handle on success
- * @returns -1 on failure
- */
-int bm_get_depth(int handle, int* depth);
-
 /**
 * @brief Gets the filename of the bitmap indexed by handle
 *
@@ -14,8 +14,8 @@
 #include "ship/ship.h"        //compute_slew_matrix

 //*************************IMPORTANT GLOBALS*************************
-fov_t VIEWER_ZOOM_DEFAULT = DEFAULT_FOV;
-fov_t COCKPIT_ZOOM_DEFAULT = DEFAULT_FOV;
+float VIEWER_ZOOM_DEFAULT = 0.75f;			//	Default viewer zoom, 0.625 as per multi-lateral agreement on 3/24/97
+float COCKPIT_ZOOM_DEFAULT = 0.75f;
 float Sexp_fov = 0.0f;
 warp_camera Warp_camera;

@@ -27,36 +27,6 @@ SCP_vector<camera*> Cameras;
 camid Current_camera;
 camid Main_camera;

-asymmetric_fov operator* (const asymmetric_fov& left, const float& right) {
-	return asymmetric_fov{ left.left * right, left.right * right, left.up * right, left.down * right };
-}
-asymmetric_fov operator+ (const asymmetric_fov& left, const float& right) {
-	float ar = (left.up - left.down) / (left.right - left.left);
-	return asymmetric_fov{ left.left - right * 0.5f, left.right + right * 0.5f, left.up + right * 0.5f * ar, left.down - right * 0.5f * ar };
-}
-asymmetric_fov operator- (const asymmetric_fov& left, const float& right) {
-	float ar = (left.up - left.down) / (left.right - left.left);
-	return asymmetric_fov{ left.left + right * 0.5f, left.right - right * 0.5f, left.up - right * 0.5f * ar, left.down + right * 0.5f * ar };
-}
-
-#define APPLY_TO_FOV_T(op, name) \
-struct apply_##name##_to_fov { \
-	float r; \
-	template<typename T> \
-	fov_t operator()(const T& l) { \
-		return fov_t(l op r); \
-	} \
-}; \
-fov_t operator op (const fov_t& zoom, const float& scale) { \
-	return std::visit(apply_##name##_to_fov{scale}, zoom); \
-}
-APPLY_TO_FOV_T(*, mul)
-APPLY_TO_FOV_T(+, add)
-APPLY_TO_FOV_T(-, sub)
-
-// Used to set the default value for in-game options
-static float fov_default = DEFAULT_FOV;
-
 static SCP_string fov_display(float val)
 {
 	auto degrees = fl_degrees(val);
@@ -64,67 +34,15 @@ static SCP_string fov_display(float val)
 	sprintf(out, u8"%.1f\u00B0", degrees);
 	return out;
 }
-
-static void parse_fov_func()
-{
-	float value;
-	stuff_float(&value);
-	CLAMP(value, 0.436332f, 1.5708f);
-	fov_default = value;
-}
-
-auto FovOption = options::OptionBuilder<float>("Graphics.FOV",
-					 std::pair<const char*, int>{"Field Of View", 1703},
-					 std::pair<const char*, int>{"The vertical field of view", 1704})
-					 .category(std::make_pair("Graphics", 1825))
-					 .range(0.436332f, 1.5708f)
-					 .change_listener([](const float& val, bool) {
-					      VIEWER_ZOOM_DEFAULT = val;
-					      return true;
-					 })
-					 .display(fov_display)
-					 .default_func([]() { return fov_default; })
-					 .level(options::ExpertLevel::Advanced)
-					 .importance(60)
-					 .parser(parse_fov_func)
-					 .finish();
-
-bool Use_cockpit_fov = false;
-
-auto CockpitFOVToggleOption = options::OptionBuilder<bool>("Graphics.CockpitFOVToggle",
-					 std::pair<const char*, int>{"Cockpit FOV Toggle", 1838},
-					 std::pair<const char*, int>{"Whether or not to use a different FOV for cockpit rendering from normal rendering", 1839})
-					 .category(std::make_pair("Graphics", 1825))
-					 .default_val(false)
-					 .change_listener([](bool val, bool) {
-					      if (!val) {
-					           COCKPIT_ZOOM_DEFAULT = VIEWER_ZOOM_DEFAULT;
-					      }
-					      return true; // This option will always persist so we never return false
-					 })
-					 .level(options::ExpertLevel::Advanced)
-					 .bind_to(&Use_cockpit_fov)
-					 .importance(61)
-					 .finish();
-
-auto CockpitFovOption = options::OptionBuilder<float>("Graphics.CockpitFOV",
-					 std::pair<const char*, int>{"Cockpit Field Of View", 1840},
-					 std::pair<const char*, int>{"The vertical field of view for cockpit rendering. Only works if cockpits are active and cockpit FOV toggle is turned on.", 1841})
-					 .category(std::make_pair("Graphics", 1825))
-					 .range(0.436332f, 1.5708f)
-					 .change_listener([](const float& val, bool) {
-					      if (Use_cockpit_fov){
-					           COCKPIT_ZOOM_DEFAULT = val;
-						  } else {
-							  COCKPIT_ZOOM_DEFAULT = VIEWER_ZOOM_DEFAULT;
-						  }
-					      return true;
-					 })
-					 .display(fov_display)
-					 .default_val(fov_default)
-					 .level(options::ExpertLevel::Advanced)
-					 .importance(62)
-					 .finish();
+auto FovOption = options::OptionBuilder<float>("Graphics.FOV", "Field Of View", "The vertical field of view.")
+                     .category("Graphics")
+                     .range(0.436332f, 1.5708f)
+                     .bind_to(&VIEWER_ZOOM_DEFAULT)
+                     .display(fov_display)
+                     .default_val(0.75f)
+                     .level(options::ExpertLevel::Advanced)
+                     .importance(60)
+                     .finish();

 //*************************CLASS: camera*************************
 //This is where the camera class begins! :D
@@ -167,7 +85,7 @@ void camera::reset()
 	func_custom_orientation = NULL;

 	fov.clear();
-	fov.set(g3_get_hfov(VIEWER_ZOOM_DEFAULT));
+	fov.set(VIEWER_ZOOM_DEFAULT);

 	pos_x.clear();
 	pos_y.clear();
@@ -186,7 +104,7 @@ void camera::set_name(const char *in_name)
 		strncpy(name, in_name, NAME_LENGTH-1);
 }

-void camera::set_fov(fov_t in_fov, float in_fov_time, float in_fov_acceleration_time, float in_fov_deceleration_time)
+void camera::set_fov(float in_fov, float in_fov_time, float in_fov_acceleration_time, float in_fov_deceleration_time)
 {
 	if(in_fov_time == 0.0f && in_fov_acceleration_time == 0.0f && in_fov_deceleration_time == 0.0f)
 	{
@@ -196,49 +114,42 @@ void camera::set_fov(fov_t in_fov, float in_fov_time, float in_fov_acceleration_
 	}

 	flags &= ~CAM_STATIONARY_FOV;
-	if(g3_get_hfov(in_fov) <= 0.0f)
+	if(in_fov <= 0.0f)
 	{
 		fov.setVD(in_fov_time, in_fov_acceleration_time, 0.0f);
 	}

-	fov.setAVD(g3_get_hfov(in_fov), in_fov_time, in_fov_acceleration_time, in_fov_deceleration_time, 0.0f);
+	fov.setAVD(in_fov, in_fov_time, in_fov_acceleration_time, in_fov_deceleration_time, 0.0f);
 }

 void camera::set_object_host(object *objp, int n_object_host_submodel)
 {
+	if(objp == NULL)
+		object_host = object_h();
+
 	object_host = object_h(objp);
 	object_host_submodel = n_object_host_submodel;
 	set_custom_position_function(NULL);
 	set_custom_orientation_function(NULL);
-
-	if (n_object_host_submodel >= 0 && objp != nullptr && objp->type == OBJ_SHIP) 
+	if(n_object_host_submodel > 0)
 	{
-		ship_subsys* ssp = GET_FIRST(&Ships[objp->instance].subsys_list);
-		while (ssp != END_OF_LIST(&Ships[objp->instance].subsys_list)) 
+		if(objp->type == OBJ_SHIP)
 		{
-			if (ssp->system_info->subobj_num == n_object_host_submodel) 
+			ship_subsys* ssp = GET_FIRST(&Ships[objp->instance].subsys_list);
+			while ( ssp != END_OF_LIST( &Ships[objp->instance].subsys_list ) )
 			{
-				if (ssp->system_info->type == SUBSYSTEM_TURRET) 
+				if(ssp->system_info->subobj_num == n_object_host_submodel)
 				{
-					set_custom_position_function(get_turret_cam_pos);
-					set_custom_orientation_function(get_turret_cam_orient);
+					if(ssp->system_info->type == SUBSYSTEM_TURRET)
+					{
+						set_custom_position_function(get_turret_cam_pos);
+						set_custom_orientation_function(get_turret_cam_orient);
+					}
 				}
+				ssp = GET_NEXT( ssp );
 			}
-			ssp = GET_NEXT(ssp);
 		}
 	}
-	else if (Use_model_eyepoint_for_set_camera_host && object_host.isValid()) 
-	{
-		const object* host = object_host.objp();
-
-		vec3d eye_pos;
-		matrix eye_orient;
-
-		object_get_eye(&eye_pos, &eye_orient, host, false, true, true);
-
-		set_position(&eye_pos);
-		set_rotation(&eye_orient);
-	}
 }

 void camera::set_object_target(object *objp, int n_object_target_submodel)
@@ -357,11 +268,11 @@ void camera::set_rotation_facing(vec3d *in_target, float in_rotation_time, float
 		if (Use_host_orientation_for_set_camera_facing)
 		{
 			// point along the target vector, but using the host orient's roll
-			vm_vector_2_matrix_norm(&temp_matrix, &targetvec, &orient->vec.uvec, nullptr);
+			vm_vector_2_matrix(&temp_matrix, &targetvec, &orient->vec.uvec, nullptr);

 			// if we have a host, we need the difference between the camera's current orient and the orient we want
 			// if not, we will later set the absolute orientation, rather than the orientation relative to the host
-			if (object_host.isValid())
+			if (object_host.IsValid())
 			{
 				vm_transpose(orient);
 				temp_matrix = temp_matrix * *orient;
@@ -370,7 +281,7 @@ void camera::set_rotation_facing(vec3d *in_target, float in_rotation_time, float
 		else
 		{
 			// point directly along the target vector
-			vm_vector_2_matrix_norm(&temp_matrix, &targetvec, nullptr, nullptr);
+			vm_vector_2_matrix(&temp_matrix, &targetvec, nullptr, nullptr);
 		}
 	}

@@ -384,7 +295,10 @@ void camera::do_frame(float  /*in_frametime*/)

 object *camera::get_object_host()
 {
-	return object_host.objp_or_null();
+	if(object_host.IsValid())
+		return object_host.objp;
+	else
+		return NULL;
 }

 int camera::get_object_host_submodel()
@@ -394,7 +308,10 @@ int camera::get_object_host_submodel()

 object *camera::get_object_target()
 {
-	return object_target.objp_or_null();
+	if(object_target.IsValid())
+		return object_target.objp;
+	else
+		return NULL;
 }

 int camera::get_object_target_submodel()
@@ -402,14 +319,11 @@ int camera::get_object_target_submodel()
 	return object_target_submodel;
 }

-fov_t camera::get_fov()
+float camera::get_fov()
 {
 	if(!(flags & CAM_STATIONARY_FOV))
 	{
-		float fov_now;
-		fov.get(&fov_now, nullptr);
-		return fov_now;
-		//TODO enable moving asymmetric fov
+		fov.get(&c_fov, NULL);
 	}

 	return c_fov;
@@ -427,7 +341,7 @@ void camera::get_info(vec3d *position, matrix *orientation, bool apply_camera_or
 	bool use_host_orient = false;

 	//POSITION
-	if(!(flags & CAM_STATIONARY_POS) || object_host.isValid())
+	if(!(flags & CAM_STATIONARY_POS) || object_host.IsValid())
 	{
 		c_pos = vmd_zero_vector;

@@ -436,16 +350,24 @@ void camera::get_info(vec3d *position, matrix *orientation, bool apply_camera_or
 		pos_y.get(&pt.xyz.y, NULL);
 		pos_z.get(&pt.xyz.z, NULL);

-		if(object_host.isValid())
+		if(object_host.IsValid())
 		{
-			object *objp = object_host.objp();
-			polymodel *pm = object_get_model(objp);
-			polymodel_instance *pmi = object_get_model_instance(objp);
+			object *objp = object_host.objp;
+			int model_num = object_get_model(objp);
+			polymodel *pm = nullptr;
+			polymodel_instance *pmi = nullptr;
+			
+			if(model_num >= 0)
+			{
+				pm = model_get(model_num);
+				if (objp->type == OBJ_SHIP)
+					pmi = model_get_instance(Ships[objp->instance].model_instance_num);
+			}

 			if(object_host_submodel < 0 || pm == NULL)
 			{
-				vm_vec_unrotate(&c_pos, &pt, &object_host.objp()->orient);
-				vm_vec_add2(&c_pos, &object_host.objp()->pos);
+				vm_vec_unrotate(&c_pos, &pt, &object_host.objp->orient);
+				vm_vec_add2(&c_pos, &object_host.objp->pos);
 			}
 			else
 			{
@@ -490,14 +412,23 @@ void camera::get_info(vec3d *position, matrix *orientation, bool apply_camera_or
 	if(orientation != NULL)
 	{
 		bool target_set = false;
-		if(!(flags & CAM_STATIONARY_ORI) || object_target.isValid() || object_host.isValid())
+		if(!(flags & CAM_STATIONARY_ORI) || object_target.IsValid() || object_host.IsValid())
 		{
-			if(object_target.isValid())
+			if(object_target.IsValid())
 			{
-				object *target_objp = object_target.objp();
-				polymodel *target_pm = object_get_model(target_objp);
-				polymodel_instance *target_pmi = object_get_model_instance(target_objp);
+				object *target_objp = object_target.objp;
+				int model_num = object_get_model(target_objp);
+				polymodel *target_pm = nullptr;
+				polymodel_instance *target_pmi = nullptr;
 				vec3d target_pos = vmd_zero_vector;
+				
+				//See if we can get the model
+				if(model_num >= 0)
+				{
+					target_pm = model_get(model_num);
+					if (target_objp->type == OBJ_SHIP)
+						target_pmi = model_get_instance(Ships[target_objp->instance].model_instance_num);
+				}

 				//If we don't have a submodel or don't have the model use object pos
 				//Otherwise, find the submodel pos as it is rotated
@@ -515,14 +446,14 @@ void camera::get_info(vec3d *position, matrix *orientation, bool apply_camera_or

 				vec3d targetvec;
 				vm_vec_normalized_dir(&targetvec, &target_pos, &c_pos);
-				vm_vector_2_matrix_norm(&c_ori, &targetvec, nullptr, nullptr);
+				vm_vector_2_matrix(&c_ori, &targetvec, NULL, NULL);
 				target_set = true;
 			}
-			else if(object_host.isValid())
+			else if(object_host.IsValid())
 			{
 				if(eyep)
 				{
-					vm_vector_2_matrix_norm(&c_ori, &host_normal, vm_vec_same(&host_normal, &object_host.objp()->orient.vec.uvec) ? nullptr : &object_host.objp()->orient.vec.uvec, nullptr);
+					vm_vector_2_matrix(&c_ori, &host_normal, vm_vec_same(&host_normal, &object_host.objp->orient.vec.uvec)?NULL:&object_host.objp->orient.vec.uvec, NULL);
 					target_set = true;
 				}
 				else if (use_host_orient)
@@ -531,7 +462,7 @@ void camera::get_info(vec3d *position, matrix *orientation, bool apply_camera_or
 				}
 				else
 				{
-					c_ori = object_host.objp()->orient;
+					c_ori = object_host.objp->orient;
 				}
 			}
 			else
@@ -578,7 +509,7 @@ warp_camera::warp_camera(object *objp)

 	vec3d object_pos = objp->pos;
 	matrix tmp;
-	object_get_eye(&object_pos, &tmp, objp);
+	ship_get_eye(&object_pos, &tmp, objp);

 	vm_vec_scale_add2( &object_pos, &Player_obj->orient.vec.rvec, 0.0f );
 	vm_vec_scale_add2( &object_pos, &Player_obj->orient.vec.uvec, 0.952f );
@@ -791,7 +722,7 @@ subtitle::subtitle(int in_x_pos, int in_y_pos, const char* in_text, const char*
 		//Get text size
 		for(int i = 0; i < num_text_lines; i++)
 		{
-			gr_get_string_size(&w, &h, text_line_ptrs[i], 1.0f, static_cast<size_t>(text_line_lens[i]));
+			gr_get_string_size(&w, &h, text_line_ptrs[i], text_line_lens[i]);

 			if(w > tw)
 				tw = w;
@@ -1048,7 +979,7 @@ int camid::getSignature()
 	return sig;
 }

-bool camid::isValid() const
+bool camid::isValid()
 {
 	if(idx >= Cameras.size())
 		return false;
@@ -1085,6 +1016,13 @@ int cam_get_next_sig()
 	return next_sig++;
 }

+camid cam_create(const char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object, int n_object_host_submodel)
+{
+	matrix ori;
+	vm_vector_2_matrix_norm(&ori, n_norm);
+	return cam_create(n_name, n_pos, &ori, n_object, n_object_host_submodel);
+}
+
 camid cam_create(const char *n_name, vec3d *n_pos, matrix *n_ori, object *n_object, int n_object_host_submodel)
 {
 	camera *cam = NULL;
@@ -1228,12 +1166,12 @@ void subtitles_do_frame_post_shaded(float frametime)
 	}
 }

-static vec3d normal_cache;
+vec3d normal_cache;

 void get_turret_cam_pos(camera *cam, vec3d *pos)
 {
 	object_h obj(cam->get_object_host());
-	if(!obj.isValid())
+	if(!obj.IsValid())
 		return;
 	ship* shipp = &Ships[cam->get_object_host()->instance];
 	ship_subsys* ssp = GET_FIRST(&shipp->subsys_list);
@@ -1241,7 +1179,7 @@ void get_turret_cam_pos(camera *cam, vec3d *pos)
 	{
 		if(ssp->system_info->subobj_num == cam->get_object_host_submodel())
 		{
-			ship_get_global_turret_gun_info(cam->get_object_host(), ssp, pos, true, &normal_cache, true, nullptr);
+			ship_get_global_turret_gun_info(cam->get_object_host(), ssp, pos, &normal_cache, 1, NULL);
 			vec3d offset = vmd_zero_vector;
 			offset.xyz.x = 0.0001f;
 			vm_vec_add2(pos, &offset); // prevent beam turrets from crashing with a nullvec
@@ -1254,9 +1192,9 @@ void get_turret_cam_pos(camera *cam, vec3d *pos)
 void get_turret_cam_orient(camera *cam, matrix *ori)
 {
 	object_h obj(cam->get_object_host());
-	if(!obj.isValid())
+	if(!obj.IsValid())
 		return;
-	vm_vector_2_matrix_norm(ori, &normal_cache, vm_vec_same(&normal_cache, &cam->get_object_host()->orient.vec.uvec) ? nullptr : &cam->get_object_host()->orient.vec.uvec, nullptr);
+	vm_vector_2_matrix(ori, &normal_cache, vm_vec_same(&normal_cache, &cam->get_object_host()->orient.vec.uvec)?NULL:&cam->get_object_host()->orient.vec.uvec, NULL);
 }

 eye* get_submodel_eye(polymodel *pm, int submodel_num)
@@ -1293,7 +1231,8 @@ float cam_get_bbox_dist(const object* viewer_obj, float preferred_distance, cons
 	if (preferred_distance > (viewer_obj->radius * EXTERN_CAM_BBOX_MULTIPLIER_PADDING + EXTERN_CAM_BBOX_CONSTANT_PADDING) * 1.5f) 
 		return preferred_distance;
 	
-	polymodel* pm = object_get_model(viewer_obj);
+	int modelnum = object_get_model(viewer_obj);
+	polymodel* pm = model_get(modelnum);
 	vec3d adjusted_bbox;
 	const vec3d* cam_vec = &cam_orient->vec.fvec;

@@ -10,8 +10,6 @@

 #include <string>

-#include <variant>
-
 #define CAM_STATIONARY_FOV			(1<<0)
 #define CAM_STATIONARY_ORI			(1<<1)
 #define CAM_STATIONARY_POS			(1<<2)
@@ -20,19 +18,6 @@
 #define	EXTERN_CAM_BBOX_CONSTANT_PADDING			5.0f
 #define	EXTERN_CAM_BBOX_MULTIPLIER_PADDING			1.5f

-#define DEFAULT_FOV 0.75f;
-
-struct asymmetric_fov {
-	float left, right, up, down;
-	friend asymmetric_fov operator* (const asymmetric_fov&, const float&);
-	friend asymmetric_fov operator+ (const asymmetric_fov&, const float&);
-	friend asymmetric_fov operator- (const asymmetric_fov&, const float&);
-};
-using fov_t = std::variant<float, asymmetric_fov>;
-fov_t operator* (const fov_t&, const float&);
-fov_t operator+ (const fov_t&, const float&);
-fov_t operator- (const fov_t&, const float&);
-
 class camera
 {
 protected:
@@ -56,7 +41,7 @@ protected:
 	avd_movement ori[9];

 	//Cache stuff
-	fov_t c_fov;
+	float c_fov;
 	vec3d c_pos;
 	matrix c_ori;
 public:
@@ -74,7 +59,7 @@ public:
 	void set_custom_position_function(void (*n_func_custom_position)(camera *cam, vec3d *pos));
 	void set_custom_orientation_function(void (*n_func_custom_orientation)(camera *cam, matrix *ori));

-	void set_fov(fov_t in_fov, float in_fov_time = 0.0f, float in_fov_acceleration_time = 0.0f, float in_deceleration_time = 0.0f);
+	void set_fov(float in_fov, float in_fov_time = 0.0f, float in_fov_acceleration_time = 0.0f, float in_deceleration_time = 0.0f);

 	void set_position(vec3d *in_position = NULL, float in_translation_time = 0.0f, float in_translation_acceleration_time = 0.0f, float in_translation_deceleration_time = 0.0f, float in_end_velocity = 0.0f);

@@ -89,7 +74,7 @@ public:
 	int get_object_host_submodel();
 	object *get_object_target();
 	int get_object_target_submodel();
-	fov_t get_fov();
+	float get_fov();
 	void get_info(vec3d *position, matrix *orientation, bool apply_camera_orientation = true);

 	//Is
@@ -170,8 +155,8 @@ public:

 //Some global stuff
 extern SCP_vector<subtitle> Subtitles;
-extern fov_t VIEWER_ZOOM_DEFAULT;
-extern fov_t COCKPIT_ZOOM_DEFAULT;
+extern float VIEWER_ZOOM_DEFAULT;
+extern float COCKPIT_ZOOM_DEFAULT;
 extern float Sexp_fov;

 //Helpful functions
@@ -179,6 +164,7 @@ void cam_init();
 void cam_close();
 void cam_do_frame(float frametime);
 camid cam_create(const char *n_name=NULL, vec3d *n_pos=NULL, matrix *n_ori=NULL, object *n_object=NULL, int n_submodel_parent=-1);
+camid cam_create(const char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object=NULL, int n_submodel_parent=-1);
 void cam_delete(camid cid);
 bool cam_set_camera(camid cid);
 void cam_reset_camera();
@@ -20,10 +20,12 @@
 #include <io.h>
 #include <direct.h>
 #include <windows.h>
+#include <winbase.h>		/* needed for memory mapping of file functions */
 #endif

 #ifdef SCP_UNIX
 #include <glob.h>
+#include <sys/mman.h>
 #endif

 #include "cfile/cfile.h"
@@ -89,10 +91,12 @@ cf_pathtype Pathtypes[CF_MAX_PATH_TYPES]  = {
 };
 // clang-format on

+#define CFILE_STACK_MAX	8

 int cfile_inited = 0;
+static int Cfile_stack_pos = 0;

-static SCP_vector<SCP_string> Cfile_stack;
+static char Cfile_stack[CFILE_STACK_MAX][CFILE_ROOT_DIRECTORY_LEN];

 std::array<CFILE, MAX_CFILE_BLOCKS> Cfile_block_list;

@@ -106,6 +110,12 @@ static CFILE *cf_open_fill_cfblock(const char* source, int line, const char* ori
 static CFILE *cf_open_packed_cfblock(const char* source, int line, const char* original_filename, FILE *fp, int type, size_t offset, size_t size);
 static CFILE *cf_open_memory_fill_cfblock(const char* source, int line, const char* original_filename, const void* data, size_t size, int dir_type);

+#if defined _WIN32
+static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, const char* original_filename, HANDLE hFile, int type);
+#elif defined SCP_UNIX
+static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, const char* original_filename, FILE *fp, int type);
+#endif
+
 static void cf_chksum_long_init();

 static void dump_opened_files()
@@ -320,16 +330,17 @@ int cfile_push_chdir(int type)

 	_getcwd(OriginalDirectory, CFILE_ROOT_DIRECTORY_LEN - 1);

-	cf_create_default_path_string(dir, type, NULL);
+	Assert(Cfile_stack_pos < CFILE_STACK_MAX);

-	int rc = _cfile_chdir(dir.c_str(), OriginalDirectory);
-
-	// if success then push the original directory on to the stack
-	if (rc == 0) {
-		Cfile_stack.push_back(OriginalDirectory);
+	if (Cfile_stack_pos >= CFILE_STACK_MAX) {
+		return -1;
 	}

-	return rc;
+	strcpy_s(Cfile_stack[Cfile_stack_pos++], OriginalDirectory);
+
+	cf_create_default_path_string(dir, type, NULL);
+
+	return _cfile_chdir(dir.c_str(), OriginalDirectory);
 }

 /**
@@ -352,16 +363,13 @@ int cfile_chdir(const char *dir)

 int cfile_pop_dir()
 {
-	if (Cfile_stack.empty())
+	Assert(Cfile_stack_pos);
+
+	if ( !Cfile_stack_pos )
 		return -1;

-	int rc = cfile_chdir(Cfile_stack.back().c_str());
-
-	Assertion(rc == 0, "Failed to chdir() to previous directory (%s)!", Cfile_stack.back().c_str());
-
-	Cfile_stack.pop_back();
-
-	return rc;
+	Cfile_stack_pos--;
+	return cfile_chdir(Cfile_stack[Cfile_stack_pos]);
 }

 // flush (delete all files in) the passed directory (by type), return the # of files deleted
@@ -430,7 +438,7 @@ int cfile_flush_dir(int dir_type)
 //    filename = name of filename or filepath to process
 //    ext = extension to add.  Must start with the period
 //    Returns: new filename or filepath with extension.
-const char *cf_add_ext(const char *filename, const char *ext)
+char *cf_add_ext(const char *filename, const char *ext)
 {
 	static char path[MAX_PATH_LEN];

@@ -624,13 +632,18 @@ void cf_create_directory(int dir_type, uint32_t location_flags)
 // parameters:  *filepath ==> name of file to open (may be path+name)
 //              *mode     ==> specifies how file should be opened (eg "rb" for read binary)
 //                            passing NULL to mode triggers an assert and returns NULL
+//               type     ==> one of:    CFILE_NORMAL
+//                                       CFILE_MEMORY_MAPPED
 //					  dir_type	=>	override extension check, value is one of CF_TYPE* #defines
 //
+//               NOTE: type parameter is an optional parameter.  The default value is CFILE_NORMAL
+//
+//
 // returns:		success ==> address of CFILE structure
 //					error   ==> NULL
 //

-CFILE* _cfopen(const char* source, int line, const char* file_path, const char* mode, int dir_type,
+CFILE* _cfopen(const char* source, int line, const char* file_path, const char* mode, int type, int dir_type,
               bool /* localize */, uint32_t location_flags)
 {
 	/* Bobboau, what is this doing here? 31 is way too short... - Goober5000
@@ -646,6 +659,12 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 	// Check that all the parameters make sense
 	Assert(file_path && strlen(file_path));
 	Assert( mode != NULL );
+	
+	// Can only open read-only binary files in memory mapped mode.
+	if ( (type & CFILE_MEMORY_MAPPED) && strcmp(mode,"rb") != 0 ) {
+		Int3();				
+		return NULL;
+	}

 	//===========================================================
 	// If in write mode, just try to open the file straight off
@@ -662,14 +681,13 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 		} else {
 			// Path type given?
 			Assert( dir_type != CF_TYPE_ANY );
-			if (dir_type == CF_TYPE_ANY)
-				return NULL;

 			// Create the directory if necessary
 			cf_create_directory(dir_type, location_flags);

 			cf_create_default_path_string(longname, dir_type, file_path, location_flags);
 		}
+		Assert( !(type & CFILE_MEMORY_MAPPED) );

 		// JOHN: TODO, you should create the path if it doesn't exist.
 		
@@ -720,11 +738,35 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 	auto find_res = cf_find_file_location(file_path, dir_type, location_flags);

 	if ( find_res.found ) {
+
 		// Fount it, now create a cfile out of it
 		nprintf(("CFileDebug", "Requested file %s found at: %s\n", file_path, find_res.full_name.c_str()));

-		// since cfopen_special already has all the code to handle the opening we can just use that here
-		return _cfopen_special(source, line, find_res, mode, dir_type);
+		if ( type & CFILE_MEMORY_MAPPED ) {
+		
+			// Can't open memory mapped files out of pack or memory files
+			if ( find_res.offset == 0 && find_res.data_ptr != nullptr )	{
+#if defined _WIN32
+				HANDLE hFile;
+
+				hFile = CreateFile(find_res.full_name.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+				if (hFile != INVALID_HANDLE_VALUE)	{
+					return cf_open_mapped_fill_cfblock(source, line, file_path, hFile, dir_type);
+				}
+#elif defined SCP_UNIX
+				FILE* fp = fopen(find_res.full_name.c_str(), "rb");
+				if (fp) {
+					return cf_open_mapped_fill_cfblock(source, line, file_path, fp, dir_type);
+				}
+#endif
+			} 
+
+		} else {
+			// since cfopen_special already has all the code to handle the opening we can just use that here
+			return _cfopen_special(source, line, find_res, mode, dir_type);
+		}
+
 	}

 	return NULL;
@@ -849,7 +891,27 @@ int cfclose( CFILE * cfile )
 	Assert(cfile != NULL);

 	result = 0;
-	if ( cfile->fp != nullptr )	{
+	if ( cfile->data && cfile->mem_mapped ) {
+		// close memory mapped file
+#if defined _WIN32
+		result = UnmapViewOfFile((void*)cfile->data);
+		Assert(result);
+		result = CloseHandle(cfile->hInFile);
+		Assert(result);	// Ensure file handle is closed properly
+		result = CloseHandle(cfile->hMapFile);
+		Assert(result);	// Ensure file handle is closed properly
+		result = 0;
+#elif defined SCP_UNIX
+		// FIXME: result is wrong after munmap() but it is successful
+		//result = munmap(cfile->data, cfile->data_length);
+		//Assert(result);
+		// This const_cast is safe since the pointer returned by mmap was also non-const
+		munmap(const_cast<void*>(cfile->data), cfile->data_length);
+		if ( cfile->fp != nullptr)
+			result = fclose(cfile->fp);
+#endif
+
+	} else if ( cfile->fp != nullptr )	{
 		Assert(cfile->fp != nullptr);
 		result = fclose(cfile->fp);
 	} else {
@@ -894,6 +956,7 @@ static CFILE *cf_open_fill_cfblock(const char* source, int line, const char* ori
 	} else {
 		CFILE *cfp = &Cfile_block_list[cfile_block_index];
 		cfp->data = nullptr;
+		cfp->mem_mapped = false;
 		cfp->fp = fp;
 		cfp->dir_type = type;
 		cfp->max_read_len = 0;
@@ -932,6 +995,7 @@ static CFILE *cf_open_packed_cfblock(const char* source, int line, const char* o

 		cfp->data = nullptr;
 		cfp->fp = fp;
+		cfp->mem_mapped = false;
 		cfp->dir_type = type;
 		cfp->max_read_len = 0;

@@ -946,6 +1010,70 @@ static CFILE *cf_open_packed_cfblock(const char* source, int line, const char* o

 }

+
+
+// cf_open_mapped_fill_cfblock() will fill up a Cfile_block element in the Cfile_block_list[] array
+// for the case of a file being opened by cf_open_mapped();
+//
+// returns:   ptr CFILE structure.  
+//
+#if defined _WIN32
+static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, const char* original_filename, HANDLE hFile, int type)
+#elif defined SCP_UNIX
+static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, const char* original_filename, FILE *fp, int type)
+#endif
+{
+	int cfile_block_index;
+
+	cfile_block_index = cfget_cfile_block();
+	if ( cfile_block_index == -1 ) {
+#ifdef SCP_UNIX
+		fclose(fp);
+#endif
+		return NULL;
+	}
+	else {
+		CFILE *cfp = &Cfile_block_list[cfile_block_index];
+
+		cfp->max_read_len = 0;
+		cfp->fp = nullptr;
+		cfp->mem_mapped = true;
+#if defined _WIN32
+		cfp->hInFile = hFile;
+#endif
+		cfp->dir_type = type;
+
+		cfp->original_filename = original_filename;
+		cfp->source_file = source;
+		cfp->line_num = line;
+
+		cf_init_lowlevel_read_code(cfp, 0, 0, 0 );
+		
+#if defined _WIN32
+		cfp->hMapFile = CreateFileMapping(cfp->hInFile, NULL, PAGE_READONLY, 0, 0, NULL);
+		if (cfp->hMapFile == NULL) {
+			nprintf(("Error", "Could not create file-mapping object.\n")); 
+			return NULL;
+		} 
+	
+		cfp->data = (ubyte*)MapViewOfFile(cfp->hMapFile, FILE_MAP_READ, 0, 0, 0);
+		Assert( cfp->data != NULL );
+#elif defined SCP_UNIX
+		cfp->fp = fp;
+		cfp->data_length = filelength(fileno(fp));
+		cfp->data = mmap(nullptr,                        // start
+		                 cfp->data_length,    // length
+		                 PROT_READ,                // prot
+		                 MAP_SHARED,                // flags
+		                 fileno(fp),                // fd
+		                 0);                        // offset
+		Assert(cfp->data != nullptr);
+#endif
+
+		return cfp;
+	}
+}
+
 static CFILE *cf_open_memory_fill_cfblock(const char* source, int line, const char* original_filename, const void* data, size_t size, int dir_type)
 {
 	int cfile_block_index;
@@ -959,6 +1087,7 @@ static CFILE *cf_open_memory_fill_cfblock(const char* source, int line, const ch

 		cfp->max_read_len = 0;
 		cfp->fp = nullptr;
+		cfp->mem_mapped = false;
 		cfp->dir_type = dir_type;

 		cfp->original_filename = original_filename;
@@ -1202,6 +1331,9 @@ int cfwrite_string_len(const char *buf, CFILE *file)
 int cfilelength(CFILE* cfile) {
 	Assert(cfile != NULL);

+	// TODO: return length of memory mapped file
+	Assert(!cfile->mem_mapped);
+
 	// cfile->size gets set at cfopen

 	// The rest of the code still uses ints, do an overflow check to detect cases where this fails
@@ -1594,7 +1726,7 @@ int cf_chksum_short(const char *filename, ushort *chksum, int max_size, int cf_t
 	*chksum = 0;

 	// attempt to open the file
-	cfile = cfopen(filename,"rt",cf_type);
+	cfile = cfopen(filename,"rt",CFILE_NORMAL,cf_type);
 	if(cfile == NULL){		
 		return 0;
 	}
@@ -1644,7 +1776,7 @@ int cf_chksum_long(const char *filename, uint *chksum, int max_size, int cf_type
 	*chksum = 0;

 	// attempt to open the file
-	cfile = cfopen(filename,"rt",cf_type);
+	cfile = cfopen(filename,"rt",CFILE_NORMAL,cf_type);
 	if(cfile == NULL){		
 		return 0;
 	}
@@ -85,6 +85,10 @@ typedef struct {
 // TRUE if type is specified and valid
 #define CF_TYPE_SPECIFIED(path_type) (((path_type)>CF_TYPE_INVALID) && ((path_type)<CF_MAX_PATH_TYPES))

+// #define's for the type parameter in cfopen.  
+#define CFILE_NORMAL				0			// open file normally
+#define CFILE_MEMORY_MAPPED	(1<<0)	//	open file as a memory-mapped file
+
 #define CF_SORT_NONE	0
 #define CF_SORT_NAME 1
 #define CF_SORT_TIME 2
@@ -167,7 +171,7 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir=NULL);
 void cfile_close();

 // add an extension to a filename if it doesn't already have it
-const char *cf_add_ext(const char *filename, const char *ext);
+char *cf_add_ext(const char *filename, const char *ext);

 // return filename of a CFILE you called cfopen() successfully on.
 const char *cf_get_filename(const CFILE *cfile);
@@ -177,7 +181,7 @@ int cf_get_dir_type(const CFILE *cfile);

 // Opens the file.  If no path is given, use the extension to look into the
 // default path.  If mode is NULL, delete the file.
-CFILE* _cfopen(const char* source_file, int line, const char* filename, const char* mode,
+CFILE* _cfopen(const char* source_file, int line, const char* filename, const char* mode, int type = CFILE_NORMAL,
               int dir_type = CF_TYPE_ANY, bool localize = false, uint32_t location_flags = CF_LOCATION_ALL);
 #define cfopen(...) _cfopen(LOCATION, __VA_ARGS__) // Pass source location to the function

@@ -373,7 +377,6 @@ struct CFileLocation {
 	SCP_string full_name;
 	size_t size          = 0;
 	size_t offset        = 0;
-	time_t m_time        = 0;
 	const void* data_ptr = nullptr;

 	explicit CFileLocation(bool found_in = false) : found(found_in) {}
@@ -149,6 +149,9 @@ int cfseek( CFILE *cfile, int offset, int where )
 	if (cfile->compression_info.header != 0)
 		return comp_fseek(cfile, offset, where);

+	// TODO: seek to offset in memory mapped file
+	Assert( !cfile->mem_mapped );
+	
 	size_t goal_position;

 	switch( where )	{
@@ -38,6 +38,13 @@ struct CFILE {
 	int dir_type;        // directory location
 	FILE* fp;                // File pointer if opening an individual file
 	const void* data;            // Pointer for memory-mapped file access.  NULL if not mem-mapped.
+	bool mem_mapped; // Flag for memory mapped files (if data is not null and this is false it means that it's an embedded file)
+#ifdef _WIN32
+	HANDLE	hInFile;			// Handle from CreateFile()
+	HANDLE	hMapFile;		// Handle from CreateFileMapping()
+#else
+	size_t data_length;    // length of data for mmap
+#endif
 	size_t lib_offset;
 	size_t raw_position;
 	size_t size;                // for packed files
@@ -22,7 +22,6 @@
 #include <windows.h>
 #include <winbase.h>		/* needed for memory mapping of file functions */
 #include <shlwapi.h>
-#include <sys/stat.h>
 #endif

 #ifdef SCP_UNIX
@@ -596,7 +595,7 @@ static void cf_add_mod_roots(const char* rootDirectory, uint32_t basic_location)

 			cf_root* root = cf_create_root();

-			root->path = std::move(rootPath);
+			root->path = rootPath;
 			if (primary) {
 				root->location_flags = basic_location | CF_LOCATION_TYPE_PRIMARY_MOD;
 			} else {
@@ -776,10 +775,9 @@ int is_ext_in_list( const char *ext_list, const char *ext )
 // Run a basic test for indexed files that may be shadowed
 #ifndef NDEBUG
 	#define ENABLE_SHADOW_CHECK		1
-	SCP_vector<SCP_string> critical_shadowed;
 #endif

-static void check_file_shadows(const int root_index __UNUSED, const int pathtype __UNUSED, const SCP_string &name __UNUSED, const SCP_string &sub_path __UNUSED, const char *real_name = nullptr)
+static void check_file_shadows(const int root_index __UNUSED, const int pathtype __UNUSED, const SCP_string &name __UNUSED, const SCP_string sub_path __UNUSED)
 {
 #if ENABLE_SHADOW_CHECK
 	if ( !cf_should_scan_subdirs(pathtype) ) {
@@ -788,12 +786,11 @@ static void check_file_shadows(const int root_index __UNUSED, const int pathtype

 	SCP_string curfile, newfile;

-	const bool critical = ((pathtype == CF_TYPE_TABLES) || (pathtype == CF_TYPE_MISSIONS));
 	const auto root = cf_get_root(root_index);

 	newfile = root->path + ((root->roottype == CF_ROOTTYPE_PACK) ? "::" : "");
 	newfile += cf_get_root_pathtype(root, pathtype) + DIR_SEPARATOR_CHAR;
-	newfile += sub_path + (real_name ? real_name : name);
+	newfile += sub_path + name;

 	for (uint i = 0; i < Num_files; ++i) {
 		const auto f = cf_get_file(i);
@@ -818,24 +815,14 @@ static void check_file_shadows(const int root_index __UNUSED, const int pathtype
 			continue;
 		}

-		if (r->roottype == CF_ROOTTYPE_PATH) {
-			curfile = f->real_name;
-		} else {
-			curfile = r->path + ((r->roottype == CF_ROOTTYPE_PACK) ? "::" : "");
-			curfile += cf_get_root_pathtype(r, pathtype) + DIR_SEPARATOR_CHAR;
-			curfile += f->sub_path + f->name_ext;
-		}
+		curfile = r->path + ((r->roottype == CF_ROOTTYPE_PACK) ? "::" : "");
+		curfile += cf_get_root_pathtype(r, pathtype) + DIR_SEPARATOR_CHAR;
+		curfile += f->sub_path + f->name_ext;

 		// this log message occurs in the middle of an existing line, hence the extra new lines
-		// critical files and files in same root are always logged, files in different root are behind a filter
-		nprintf(((critical || !root->path.compare(r->path)) ? "General" : "CFileSystem", "\nWARNING! A %sfile being indexed may be shadowed by an existing file!\n New:\n  %s\n Existing:\n  %s\n",
-				critical ? "critical " : "",
+		mprintf(("\nWARNING! A file being indexed may be shadowed by an existing file!\n New:\n  %s\n Existing:\n  %s\n",
 				newfile.c_str(), curfile.c_str()));

-		if (critical) {
-			critical_shadowed.push_back(name);
-		}
-
 		break;
 	}
 #endif
@@ -899,18 +886,12 @@ void cf_search_root_path(int root_index)

 		for (auto &file : files) {
 			auto ext_idx = file.name.rfind('.');
-			auto orig_name = file.name;
-
-			if ( ext_idx != SCP_string::npos && SCP_string_lcase_equal_to()(file.name.substr(ext_idx), SCP_string(".lz41")) ) {
-				file.name = file.name.erase(ext_idx, file.name.length());
-				ext_idx = file.name.rfind('.');
-			}

 			if ( ext_idx == SCP_string::npos || !is_ext_in_list(Pathtypes[i].extensions, file.name.substr(ext_idx+1).c_str()) ) {
 				continue;
 			}

-			check_file_shadows(root_index, i, file.name, file.sub_path, orig_name.c_str());
+			check_file_shadows(root_index, i, file.name, file.sub_path);

 			cf_file *cfile = cf_create_file();

@@ -920,7 +901,7 @@ void cf_search_root_path(int root_index)
 			cfile->write_time = file.m_time;
 			cfile->size = static_cast<int>(file.size);
 			cfile->pack_offset = 0;
-			cfile->real_name = search_path + DIR_SEPARATOR_STR + file.sub_path + orig_name;
+			cfile->real_name = search_path + DIR_SEPARATOR_STR + file.sub_path + file.name;
 			cfile->sub_path = file.sub_path;

 			++num_files;
@@ -1162,24 +1143,6 @@ void cf_build_file_list()
 		}
 	}

-#ifndef NDEBUG
-	// if some special/critical files might be shadowed then make sure the user knows about it
-	if ( !critical_shadowed.empty() && !running_unittests ) {
-		SCP_string shadowed;
-		const auto count = critical_shadowed.size();
-
-		// only report a few of the files so that the warning dialog doesn't get freakishly large
-		for (size_t j = 0; (j < 5) && (j < count); ++j) {
-			shadowed += critical_shadowed[j] + '\n';
-		}
-
-		Warning(LOCATION, "Some critical files might be shadowed! Please check the debug log for details.\n\n"
-							SIZE_T_ARG " file(s) detected, including:\n%s", count, shadowed.c_str());
-	}
-
-	critical_shadowed.clear();
-	critical_shadowed.shrink_to_fit();
-#endif
 }


@@ -1238,22 +1201,6 @@ static bool sub_path_match(const SCP_string &search, const SCP_string &index)
 	return !stricmp(search.c_str(), index.c_str());
 }

-static time_t get_mtime(int fd)
-{
-#ifdef _WIN32
-	struct _stat buf;
-	#define fstat _fstat
-#else
-	struct stat buf;
-#endif
-
-	if (fstat(fd, &buf) != 0) {
-		return 0;
-	}
-
-	return buf.st_mtime;
-}
-
 /**
 * Searches for a file.
 *
@@ -1288,7 +1235,6 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, uint32_t
 		if (fp)	{
 			CFileLocation res(true);
 			res.size = static_cast<size_t>(filelength(fileno(fp)));
-			res.m_time = get_mtime(fileno(fp));

 			fclose(fp);

@@ -1351,7 +1297,6 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, uint32_t
 			if (fp) {
 				CFileLocation res(true);
 				res.size = static_cast<size_t>(filelength( fileno(fp) ));
-				res.m_time = get_mtime(fileno(fp));

 				fclose(fp);

@@ -1408,7 +1353,6 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, uint32_t
 			res.offset = (size_t)f->pack_offset;
 			res.data_ptr = f->data;
 			res.name_ext = f->name_ext;
-			res.m_time = f->write_time;

 			if (f->data != nullptr) {
 				// This is an in-memory file so we just copy the pathtype name + file name
@@ -1544,7 +1488,6 @@ CFileLocationExt cf_find_file_location_ext(const char *filename, const int ext_n
 				CFileLocationExt res(cur_ext);
 				res.found = true;
 				res.size = static_cast<size_t>(filelength( fileno(fp) ));
-				res.m_time = get_mtime(fileno(fp));

 				fclose(fp);

@@ -1633,7 +1576,6 @@ CFileLocationExt cf_find_file_location_ext(const char *filename, const int ext_n
 				res.offset = (size_t)f->pack_offset;
 				res.data_ptr = f->data;
 				res.name_ext = f->name_ext;
-				res.m_time = f->write_time;

 				if (f->data != nullptr) {
 					// This is an in-memory file so we just copy the pathtype name + file name
@@ -16,11 +16,7 @@ bool CustomCheat::canUseCheat() {

 void CustomCheat::runCheat() {
 	if (!canUseCheat()) return;
-
-	//Only try to send the message if we actually have one to send and are in a mission
-	if (!cheatMsg.empty() && (Game_mode & GM_IN_MISSION))
-		HUD_printf("%s", cheatMsg.c_str());
-
+	HUD_printf("%s", cheatMsg.c_str());
 	scripting::hooks::OnCheat->run(scripting::hook_param_list(scripting::hook_param("Cheat", 's', cheatCode)));
 	CheatUsed = cheatCode;
 }
@@ -82,7 +78,7 @@ void SpawnShipCheat::runCheat() {
 				if (ptr->system_info->type == SUBSYSTEM_TURRET)
 				{
 					ptr->weapons.flags.set(Ship::Weapon_Flags::Beam_Free);
-					ptr->turret_next_fire_stamp = timestamp(Random::next(50, 4000));
+					ptr->turret_next_fire_stamp = timestamp((int)frand_range(50.0f, 4000.0f));
 				}
 			}

@@ -112,9 +108,8 @@ void parse_cheat_table(const char* filename) {
 				code = code.substr(0, CHEAT_BUFFER_LEN);
 			}

-			if (optional_string("+Message:")) {
-				stuff_string(msg, F_MESSAGE);
-			}
+			required_string("+Message:");
+			stuff_string(msg, F_MESSAGE);

 			if (optional_string("+RequireCheats:")) {
 				stuff_boolean(&requireCheats);
@@ -15,7 +15,6 @@
 #include "globalincs/pstypes.h"
 #include "globalincs/systemvars.h"
 #include "globalincs/version.h"
-#include "graphics/openxr.h"
 #include "graphics/shadows.h"
 #include "hud/hudconfig.h"
 #include "io/joy.h"
@@ -40,7 +39,6 @@
 #ifdef SCP_UNIX
 #include "osapi/osapi.h"
 #include <dirent.h>
-#include <sys/stat.h>
 #endif

 #include <cstring>
@@ -165,9 +163,11 @@ Flag exe_params[] =
 	{ "-nonormal",			"Disable normal maps",						true,	EASY_DEFAULT | EASY_HI_MEM_OFF,		EASY_ALL_ON  | EASY_HI_MEM_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nonormal" },
 	{ "-emissive_light",	"Enable emissive light from ships",			true,	0,									EASY_DEFAULT,					"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-emissive_light" },
 	{ "-noheight",			"Disable height/parallax maps",				true,	EASY_DEFAULT | EASY_HI_MEM_OFF,		EASY_ALL_ON  | EASY_HI_MEM_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noheight" },
+	{ "-3dshockwave",		"Enable 3D shockwaves",						true,	EASY_ALL_ON  | EASY_HI_MEM_ON,		EASY_DEFAULT | EASY_HI_MEM_OFF,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-3dshockwave" },
 	{ "-no_post_process",	"Disable post-processing",					true,	EASY_DEFAULT | EASY_HI_MEM_OFF,		EASY_ALL_ON | EASY_HI_MEM_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_post_process" },
 	{ "-soft_particles",	"Enable soft particles",					true,	EASY_ALL_ON,						EASY_DEFAULT,					"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-soft_particles" },
 	{ "-aa",				"Enable Post-process anti-aliasing",		true,	EASY_ALL_ON  | EASY_HI_MEM_ON,		EASY_DEFAULT | EASY_HI_MEM_OFF,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-aa" },
+	{ "-nolightshafts",		"Disable lightshafts",						true,	EASY_DEFAULT | EASY_HI_MEM_OFF,		EASY_ALL_ON | EASY_HI_MEM_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nolightshafts"},
 	{ "-fb_explosions",		"Enable Framebuffer Shockwaves",			true,	EASY_ALL_ON,						EASY_DEFAULT,					"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fb_explosions", },
    { "-fb_thrusters",      "Enable Framebuffer Thrusters",             true,   EASY_ALL_ON,						EASY_DEFAULT,					"Graphics",     "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fb_thrusters", },
 	{ "-no_deferred",		"Disable Deferred Lighting",				true,	EASY_DEFAULT | EASY_HI_MEM_OFF,		EASY_ALL_ON | EASY_HI_MEM_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_deferred"},
@@ -188,13 +188,13 @@ Flag exe_params[] =
 	//flag					launcher text								FSO		on_flags							off_flags						category		reference URL
 	{ "-window",			"Run in window",							true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-window", },
 	{ "-fullscreen_window",	"Run in fullscreen window",					false,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fullscreen_window", },
-	{ "-capture_mouse",		"Capture the mouse within the window",		true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-capture_mouse", },
 	{ "-stretch_menu",		"Stretch interface to fill screen",			true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-stretch_menu", },
 	{ "-noscalevid",		"Disable scale-to-window for movies",		true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noscalevid", },
+	{ "-nomotiondebris",	"Disable motion debris",					true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nomotiondebris",},
+	{ "-3dwarp",			"Enable 3D warp",							true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-3dwarp", },
+	{ "-warp_flash",		"Enable flash upon warp",					true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-warp_flash", },
 	{ "-no_ap_interrupt",	"Disable interrupting autopilot",			true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_ap_interrupt", },
-	{ "-vr",				"Enable Virtual Reality Mode",				true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-vr", },
-	{ "-no_unfocused_pause","Don't pause if the window isn't focused",	true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_unfocused_pause", },
-	{ "-orig_speedx_range", "Restrict speedup/slowdown (1x to 4x)", 	true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-orig_speedx_range", },
+	{ "-no_screenshake",	"Disable screen shaking",					true,	0,									EASY_DEFAULT,					"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_screenshake", },

 	//flag					launcher text								FSO		on_flags							off_flags						category		reference URL
 	{ "-nosound",			"Disable all sound",						false,	0,									EASY_DEFAULT,					"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nosound", },
@@ -218,7 +218,6 @@ Flag exe_params[] =

 	//flag					launcher text								FSO		on_flags							off_flags						category		reference URL
 	{ "-no_set_gamma",		"Disable setting of gamma",					true,	0,									EASY_DEFAULT,					"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_set_gamma", },
-	{ "-no_ingame_options",	"Disable using ingame options",				true,	0,									EASY_DEFAULT,					"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_ingame_options", },
 	{ "-nomovies",			"Disable video playback",					true,	0,									EASY_DEFAULT,					"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nomovies", },
 	{ "-noparseerrors",		"Disable parsing errors",					true,	0,									EASY_DEFAULT,					"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noparseerrors", },
 	{ "-loadallweps",		"Load all weapons, even those not used",	true,	0,									EASY_DEFAULT,					"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-loadallweps", },
@@ -236,9 +235,6 @@ Flag exe_params[] =
 	{ "-prefer_ipv4",		"Prefer IPv4 DNS lookups",					true,	0,									EASY_DEFAULT,					"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-prefer_ipv4", },
 	{ "-prefer_ipv6",		"Prefer IPv6 DNS lookups",					true,	0,									EASY_DEFAULT,					"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-prefer_ipv6", },
 	{ "-log_multi_packet",	"Log multi packet types ",					true,	0,									EASY_DEFAULT,					"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-log_multi_packet",},
-	{ "-no_bsp_align",		"Disable pof BSP data alignment",			true,	0,									EASY_DEFAULT,					"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_bsp_align", },
-    { "-no_large_shaders",	"Split large shader into smaller shaders",		true,	0,									EASY_DEFAULT,					"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_large_shaders", },
-
 #ifdef WIN32
 	{ "-fix_registry",	"Use a different registry path",				true,	0,									EASY_DEFAULT,					"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fix_registry", },
 #endif
@@ -261,12 +257,12 @@ Flag exe_params[] =
 	{ "-output_sexps",		"Output SEXPs to sexps.html",				true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-output_sexps", },
 	{ "-output_scripting",	"Output scripting to scripting.html",		true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-output_scripting", },
 	{ "-output_script_json",	"Output scripting doc to scripting.json",	true,	0,								EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-output_script_json", },
-	{ "-output_script_lua",	"Output scripting doc to scripting.lua",	true,	0,								EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-output_script_luastub", },
 	{ "-controlconfig_tbl",	"Save control presets to table",			true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-controlconfig_tbl", },
 	{ "-save_render_target",	"Save render targets to file",			true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-save_render_target", },
 	{ "-verify_vps",		"Spew VP CRCs to vp_crcs.txt",				true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-verify_vps", },
 	{ "-reparse_mainhall",	"Reparse mainhall.tbl when loading halls",	false,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-reparse_mainhall", },
 	{ "-noninteractive",	"Disables interactive dialogs",				true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noninteractive", },
+	{ "-no_unfocused_pause","Don't pause if the window isn't focused",	true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_unfocused_pause", },
 	{ "-benchmark_mode",	"Puts the game into benchmark mode",		true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-benchmark_mode", },
 	{ "-profile_frame_time","Profile frame time",						true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-profile_frame_time", },
 	{ "-profile_write_file", "Write profiling information to file",		true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-profile_write_file", },
@@ -277,7 +273,6 @@ Flag exe_params[] =
 	{ "-slow_frames_ok",	"Don't adjust timestamps for slow frames",	true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-slow_frames_ok", },
 	{ "-imgui_debug",		"Show imgui debug/demo window in the lab",  true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-imgui_debug", },
 	{ "-luadev",			"Make lua errors non-fatal",				true,	0,									EASY_DEFAULT,					"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-luadev", },
-	{"-vulkan",			"Use vulkan render backend",				true,	0,									  EASY_DEFAULT,				"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-vulkan", },
 };
 // clang-format on

@@ -316,6 +311,7 @@ int Cmdline_cd_check = 1;
 int Cmdline_closed_game = 0;
 int Cmdline_freespace_no_music = 0;
 int Cmdline_freespace_no_sound = 0;
+int Cmdline_gimme_all_medals = 0;
 int Cmdline_mouse_coords = 0;
 int Cmdline_multi_log = 0;
 int Cmdline_multi_stream_chat_to_file = 0;
@@ -333,33 +329,38 @@ int Cmdline_use_last_pilot = 0;
 // Graphics related
 cmdline_parm fov_arg("-fov", "Vertical field-of-view factor", AT_FLOAT);					// Cmdline_fov  -- comand line FOV -Bobboau
 cmdline_parm fov_cockpit_arg("-fov_cockpit", "Vertical field-of-view factor for Cockpits", AT_FLOAT);
+cmdline_parm clip_dist_arg("-clipdist", "Changes the distance from the viewpoint for the near-clipping plane", AT_FLOAT);		// Cmdline_clip_dist
 cmdline_parm ambient_power_arg("-ambient", "Multiplies the brightness of all ambient light", AT_FLOAT);
 cmdline_parm light_power_arg("-light", "Multiplies the brightness of all light", AT_FLOAT);
 cmdline_parm emissive_power_arg("-emissive", "Multiplies the brightness of all ambient light", AT_FLOAT);
 cmdline_parm emissive_arg("-emissive_light", "Enable emissive light from ships", AT_NONE);		// semi-deprecated but still functional
 cmdline_parm env("-noenv", NULL, AT_NONE);								// Cmdline_env
 cmdline_parm glow_arg("-noglow", NULL, AT_NONE); 						// Cmdline_glow  -- use Bobs glow code
+cmdline_parm nomotiondebris_arg("-nomotiondebris", NULL, AT_NONE);		// Cmdline_nomotiondebris  -- Removes those ugly floating rocks -C
 cmdline_parm noscalevid_arg("-noscalevid", NULL, AT_NONE);				// Cmdline_noscalevid  -- disable video scaling that fits to window
 cmdline_parm spec_arg("-nospec", NULL, AT_NONE);			// Cmdline_spec  --
 cmdline_parm normal_arg("-nonormal", NULL, AT_NONE);						// Cmdline_normal  -- disable normal mapping
 cmdline_parm height_arg("-noheight", NULL, AT_NONE);						// Cmdline_height  -- enable support for parallax mapping
+cmdline_parm enable_3d_shockwave_arg("-3dshockwave", NULL, AT_NONE);
 cmdline_parm softparticles_arg("-soft_particles", NULL, AT_NONE);
 cmdline_parm no_postprocess_arg("-no_post_process", "Disables post-processing", AT_NONE);
+cmdline_parm bloom_intensity_arg("-bloom_intensity", "Set bloom intensity, requires post-processing", AT_INT);
 cmdline_parm post_process_aa_arg("-aa", "Enables post-process antialiasing", AT_NONE);
 cmdline_parm post_process_aa_preset_arg("-aa_preset", "Sets the AA effect to use. See the wiki for details", AT_INT);
 cmdline_parm deprecated_fxaa_arg("-fxaa", nullptr, AT_NONE);
 cmdline_parm deprecated_fxaa_preset_arg("-fxaa_preset", "FXAA quality (0-2), requires post-processing and -fxaa", AT_INT);
 cmdline_parm deprecated_smaa_arg("-smaa", nullptr, AT_NONE);
 cmdline_parm deprecated_smaa_preset_arg("-smaa_preset", "SMAA quality (0-3), requires post-processing and -smaa", AT_INT);
-cmdline_parm msaa_enabled_arg("-msaa", nullptr, AT_INT);
 cmdline_parm fb_explosions_arg("-fb_explosions", NULL, AT_NONE);
 cmdline_parm fb_thrusters_arg("-fb_thrusters", NULL, AT_NONE);
+cmdline_parm flightshaftsoff_arg("-nolightshafts", NULL, AT_NONE);
 cmdline_parm shadow_quality_arg("-shadow_quality", NULL, AT_INT);
 cmdline_parm enable_shadows_arg("-enable_shadows", NULL, AT_NONE);
 cmdline_parm no_deferred_lighting_arg("-no_deferred", NULL, AT_NONE);	// Cmdline_no_deferred
 cmdline_parm deferred_lighting_cockpit_arg("-deferred_cockpit", nullptr, AT_NONE);
 cmdline_parm anisotropy_level_arg("-anisotropic_filter", NULL, AT_INT);

+float Cmdline_clip_dist = Default_min_draw_distance;
 float Cmdline_ambient_power = 1.0f;
 float Cmdline_emissive_power = 0.0f;
 float Cmdline_light_power = 1.0f;
@@ -371,18 +372,20 @@ int Cmdline_spec = 1;
 int Cmdline_emissive = 0;
 int Cmdline_normal = 1;
 int Cmdline_height = 1;
+int Cmdline_enable_3d_shockwave = 0;
 int Cmdline_softparticles = 0;
+int Cmdline_bloom_intensity = 25;
+bool Cmdline_force_lightshaft_off = false;
 int Cmdline_no_deferred_lighting = 0;
 bool Cmdline_deferred_lighting_cockpit = false;
 int Cmdline_aniso_level = 0;
-int Cmdline_msaa_enabled = 0;

 // Game Speed related
 cmdline_parm no_fpscap("-no_fps_capping", "Don't limit frames-per-second", AT_NONE);	// Cmdline_NoFPSCap
 cmdline_parm no_vsync_arg("-no_vsync", NULL, AT_NONE);		// Cmdline_no_vsync

 int Cmdline_NoFPSCap = 0; // Disable FPS capping - kazan
-bool Cmdline_no_vsync = false;
+int Cmdline_no_vsync = 0;

 // HUD related
 cmdline_parm ballistic_gauge("-ballistic_gauge", NULL, AT_NONE);	// Cmdline_ballistic_gauge
@@ -397,18 +400,20 @@ int Cmdline_orb_radar = 0;
 int Cmdline_rearm_timer = 0;

 // Gameplay related
+cmdline_parm use_3dwarp("-3dwarp", nullptr, AT_NONE);			// Is now Fireball_use_3d_warp
+cmdline_parm use_warp_flash("-warp_flash", nullptr, AT_NONE);	// Cmdline_warp_flash
 cmdline_parm allow_autpilot_interrupt("-no_ap_interrupt", nullptr, AT_NONE);
 cmdline_parm stretch_menu("-stretch_menu", nullptr, AT_NONE);	// Cmdline_stretch_menu
-cmdline_parm capture_mouse("-capture_mouse", nullptr, AT_NONE);	// Cmdline_capture_mouse
-cmdline_parm vr("-vr", nullptr, AT_NONE);
+cmdline_parm no_screenshake("-no_screenshake", nullptr, AT_NONE); // Cmdline_no_screenshake
 cmdline_parm deadzone("-deadzone", 
 "Sets the joystick deadzone. Integer value from 0 to 100 as a percentage of the joystick's range (100% would make the stick do nothing). Disables deadzone slider in the in-game Options menu.", AT_INT); //Cmdline_deadzone

+int Cmdline_ship_choice_3d = 0;
+int Cmdline_weapon_choice_3d = 0;
 int Cmdline_autopilot_interruptable = 1;
-bool Cmdline_stretch_menu = false;
-bool Cmdline_capture_mouse = false;
+int Cmdline_stretch_menu = 0;
+int Cmdline_no_screenshake = 0;
 int Cmdline_deadzone = -1;
-bool Cmdline_enable_vr = false;

 // Audio related
 cmdline_parm voice_recognition_arg("-voicer", NULL, AT_NONE);	// Cmdline_voice_recognition
@@ -418,10 +423,8 @@ int Cmdline_no_enhanced_sound = 0;

 // MOD related
 cmdline_parm mod_arg("-mod", "List of folders to overwrite/add-to the default data", AT_STRING, true);	// Cmdline_mod  -- DTP modsupport
-cmdline_parm campaign_arg("-campaign", "Set current campaign", AT_STRING);	// Cmdline_campaign

 char *Cmdline_mod = NULL; //DTP for mod argument
-char *Cmdline_campaign = nullptr; // for campaign argument

 // Multiplayer/Network related
 cmdline_parm almission_arg("-almission", "Autoload multiplayer mission", AT_STRING);		// Cmdline_almission  -- DTP for autoload Multi mission
@@ -439,16 +442,13 @@ char *Cmdline_gateway_ip = nullptr;
 // Launcher related options
 cmdline_parm portable_mode("-portable_mode", NULL, AT_NONE);
 cmdline_parm joy_info("-joy_info", "Outputs SDL joystick info", AT_NONE);
-cmdline_parm lang_arg("-language", "Language name as defined in strings.tbl", AT_STRING);

 bool Cmdline_portable_mode = false;
-SCP_string Cmdline_lang;

 // Troubleshooting
 cmdline_parm loadallweapons_arg("-loadallweps", NULL, AT_NONE);	// Cmdline_load_all_weapons
 cmdline_parm nomovies_arg("-nomovies", NULL, AT_NONE);		// Cmdline_nomovies  -- Allows video streaming
 cmdline_parm no_set_gamma_arg("-no_set_gamma", NULL, AT_NONE);	// Cmdline_no_set_gamma
-cmdline_parm no_ingame_options_arg("-no_ingame_options", NULL, AT_NONE); // Cmdline_no_ingame_options
 cmdline_parm no_fbo_arg("-disable_fbo", NULL, AT_NONE);		// Cmdline_no_fbo
 cmdline_parm no_pbo_arg("-disable_pbo", NULL, AT_NONE);		// Cmdline_no_pbo
 cmdline_parm mipmap_arg("-mipmap", NULL, AT_NONE);			// Cmdline_mipmap
@@ -464,8 +464,6 @@ cmdline_parm noshadercache_arg("-noshadercache", NULL, AT_NONE);
 cmdline_parm prefer_ipv4_arg("-prefer_ipv4", nullptr, AT_NONE);
 cmdline_parm prefer_ipv6_arg("-prefer_ipv6", nullptr, AT_NONE);
 cmdline_parm log_multi_packet_arg("-log_multi_packet", nullptr, AT_NONE);
-cmdline_parm no_bsp_align_arg("-no_bsp_align", nullptr, AT_NONE);
-cmdline_parm no_large_shaders("-no_large_shaders", NULL, AT_NONE);
 #ifdef WIN32
 cmdline_parm fix_registry("-fix_registry", NULL, AT_NONE);
 #endif
@@ -473,7 +471,6 @@ cmdline_parm fix_registry("-fix_registry", NULL, AT_NONE);
 int Cmdline_load_all_weapons = 0;
 int Cmdline_nomovies = 0;
 int Cmdline_no_set_gamma = 0;
-bool Cmdline_no_ingame_options = false;
 int Cmdline_no_fbo = 0;
 int Cmdline_no_pbo = 0;
 int Cmdline_ati_color_swap = 0;
@@ -488,8 +485,6 @@ bool Cmdline_noshadercache = false;
 bool Cmdline_prefer_ipv4 = false;
 bool Cmdline_prefer_ipv6 = false;
 bool Cmdline_dump_packet_type = false;
-bool Cmdline_no_bsp_align = false;
-bool Cmdline_no_large_shaders = false;
 #ifdef WIN32
 bool Cmdline_alternate_registry_path = false;
 #endif
@@ -509,16 +504,13 @@ cmdline_parm stats_arg("-stats", NULL, AT_NONE);				// Cmdline_show_stats
 cmdline_parm save_render_targets_arg("-save_render_target", NULL, AT_NONE);	// Cmdline_save_render_targets
 cmdline_parm window_arg("-window", NULL, AT_NONE);				// Cmdline_window
 cmdline_parm fullscreen_window_arg("-fullscreen_window", "Fullscreen/borderless window (Windows only)", AT_NONE);
-cmdline_parm deprecated_res_arg("-res", "Deprecated, resolution, formatted like 1600x900", AT_STRING);
-cmdline_parm render_res_arg("-render_res", "Resolution, formatted like 1600x900", AT_STRING);
-cmdline_parm window_res_arg("-window_res", "Window resolution, formatted like 1600x900.", AT_STRING);
+cmdline_parm res_arg("-res", "Resolution, formatted like 1600x900", AT_STRING);
 cmdline_parm center_res_arg("-center_res", "Resolution of center monitor, formatted like 1600x900", AT_STRING);
 cmdline_parm verify_vps_arg("-verify_vps", NULL, AT_NONE);	// Cmdline_verify_vps  -- spew VP crcs to vp_crcs.txt
 cmdline_parm parse_cmdline_only(PARSE_COMMAND_LINE_STRING, "Ignore any cmdline_fso.cfg files", AT_NONE);
 cmdline_parm reparse_mainhall_arg("-reparse_mainhall", NULL, AT_NONE); //Cmdline_reparse_mainhall
 cmdline_parm frame_profile_write_file("-profile_write_file", NULL, AT_NONE); // Cmdline_profile_write_file
 cmdline_parm no_unfocused_pause_arg("-no_unfocused_pause", NULL, AT_NONE); //Cmdline_no_unfocus_pause
-cmdline_parm retail_time_compression_range_arg("-orig_speedx_range", NULL, AT_NONE); //Cmdline_retail_time_compression_range
 cmdline_parm benchmark_mode_arg("-benchmark_mode", NULL, AT_NONE); //Cmdline_benchmark_mode
 cmdline_parm pilot_arg("-pilot", nullptr, AT_STRING); //Cmdline_pilot
 cmdline_parm noninteractive_arg("-noninteractive", NULL, AT_NONE); //Cmdline_noninteractive
@@ -533,7 +525,6 @@ cmdline_parm fixed_seed_rand("-seed", nullptr, AT_INT);	// Cmdline_rng_seed,Cmdl
 cmdline_parm luadev_arg("-luadev", "Make lua errors non-fatal", AT_NONE);	// Cmdline_lua_devmode
 cmdline_parm override_arg("-override_data", "Enable override directory", AT_NONE);	// Cmdline_override_data
 cmdline_parm imgui_debug_arg("-imgui_debug", nullptr, AT_NONE);
-cmdline_parm vulkan("-vulkan", nullptr, AT_NONE);

 char *Cmdline_start_mission = NULL;
 int Cmdline_dis_collisions = 0;
@@ -548,16 +539,14 @@ int Cmdline_bmpman_usage = 0;
 int Cmdline_show_pos = 0;
 int Cmdline_show_stats = 0;
 int Cmdline_save_render_targets = 0;
-bool Cmdline_window = false;
-bool Cmdline_fullscreen_window = false;
-std::optional<std::pair<uint16_t, uint16_t>>Cmdline_window_res = std::nullopt;
+int Cmdline_window = 0;
+int Cmdline_fullscreen_window = 0;
 char *Cmdline_res = 0;
 char *Cmdline_center_res = 0;
 int Cmdline_verify_vps = 0;
 int Cmdline_reparse_mainhall = 0;
 bool Cmdline_profile_write_file = false;
 bool Cmdline_no_unfocus_pause = false;
-bool Cmdline_retail_time_compression_range = false;
 bool Cmdline_benchmark_mode = false;
 const char *Cmdline_pilot = nullptr;
 bool Cmdline_noninteractive = false;
@@ -571,14 +560,12 @@ bool Cmdline_slow_frames_ok = false;
 bool Cmdline_lua_devmode = false;
 bool Cmdline_override_data = false;
 bool Cmdline_show_imgui_debug = false;
-bool Cmdline_vulkan = false;

 // Other
 cmdline_parm get_flags_arg(GET_FLAGS_STRING, "Output the launcher flags file", AT_STRING);
 cmdline_parm output_sexp_arg("-output_sexps", NULL, AT_NONE); //WMC - outputs all SEXPs to sexps.html
 cmdline_parm output_scripting_arg("-output_scripting", NULL, AT_NONE);	//WMC
 cmdline_parm output_script_json_arg("-output_script_json", nullptr, AT_NONE);	// m!m
-cmdline_parm output_script_luastub_arg("-output_script_lua", nullptr, AT_NONE); // mjnmixael
 cmdline_parm generate_controlconfig_arg("-controlconfig_tbl", nullptr, AT_NONE);	

 // Deprecated flags - CommanderDJ
@@ -601,13 +588,6 @@ cmdline_parm deprecated_spec_tube_arg("-spec_tube", "Deprecated", AT_NONE);
 cmdline_parm deprecated_ambient_factor_arg("-ambient_factor", "Deprecated", AT_NONE);	//
 cmdline_parm deprecated_ship_choice_3d_arg("-ship_choice_3d", "Deprecated", AT_NONE);
 cmdline_parm deprecated_weapon_choice_3d_arg("-weapon_choice_3d", "Deprecated", AT_NONE);
-cmdline_parm deprecated_no_screenshake("-no_screenshake", "Deprecated", AT_NONE);
-cmdline_parm deprecated_bloom_intensity_arg("-bloom_intensity", "Deprecated", AT_INT);
-cmdline_parm deprecated_nomotiondebris_arg("-nomotiondebris", "Deprecated", AT_NONE);
-cmdline_parm deprecated_flightshaftsoff_arg("-nolightshafts", "Deprecated", AT_NONE);
-cmdline_parm deprecated_use_warp_flash("-warp_flash", "Deprecated", AT_NONE);
-cmdline_parm deprecated_use_3dwarp("-3dwarp", "Deprecated", AT_NONE);
-cmdline_parm deprecated_enable_3d_shockwave_arg("-3dshockwave", "Deprecated", AT_NONE);

 #ifndef NDEBUG
 // NOTE: this assumes that os_init() has already been called but isn't a fatal error if it hasn't
@@ -643,8 +623,8 @@ void cmdline_debug_print_cmdline()
 }
 #endif

-// builds simple cmdline
-SCP_string cmdline_build_string()
+// prints simple cmdline to multi.log
+void cmdline_print_cmdline_multi()
 {
 	cmdline_parm *parmp;
 	int found = 0;
@@ -663,18 +643,10 @@ SCP_string cmdline_build_string()
 	}

 	if ( !found ) {
-		return "";
+		cmdline << " <none>";
 	}

-	return cmdline.str();
-}
-
-// prints simple cmdline to multi.log
-void cmdline_print_cmdline_multi()
-{
-	auto str = cmdline_build_string();
-
-	ml_printf("Command line:%s", str.empty() ? " <none>" : str.c_str());
+	ml_printf("Command line:%s", cmdline.str().c_str());
 }

 //	Return true if this character is an extra char (white space and quotes)
@@ -683,6 +655,7 @@ int is_extra_space(char ch)
 	return ((ch == ' ') || (ch == '\t') || (ch == 0x0a) || (ch == '\'') || (ch == '\"'));
 }

+
 // eliminates all leading and trailing extra chars from a string.  Returns pointer passed in.
 char *drop_extra_chars(char *str)
 {
@@ -854,7 +827,7 @@ void os_validate_parms(int argc, char *argv[])
 				// if we got a -help, --help, -h, or -? then show the help text, otherwise show unknown option
 				if (!stricmp(token, "-help") || !stricmp(token, "--help") || !stricmp(token, "-h") || !stricmp(token, "-?")) {
 					printf("FreeSpace 2 Open, version %s\n", FS_VERSION_FULL);
-					printf("Website: https://scp.indiegames.us\n");
+					printf("Website: http://scp.indiegames.us\n");
 					printf("Github (bug reporting): https://github.com/scp-fs2open/fs2open.github.com/issues\n\n");
 					printf("Usage: fs2_open [options]\n");

@@ -1214,133 +1187,93 @@ bool cmdline_parm::has_param() {
 }

 #ifdef SCP_UNIX
-extern void normalize_directory_separators(SCP_string &str);
-
-static SCP_string get_real_mod_path(const char *mod)
+// Return a vector with all filesystem names of "parent/dir" relative to parent.
+// dir must not contain a slash.
+static SCP_vector<SCP_string> unix_get_single_dir_names(const SCP_string& parent, const SCP_string& dir)
 {
-	DIR *dirp;
-	SCP_string fullpath;
-	SCP_string mod_path = mod;
+	SCP_vector<SCP_string> ret;

-	normalize_directory_separators(mod_path);
-
-	fullpath = SCP_string(".") + DIR_SEPARATOR_STR;
-	fullpath += mod_path;
-
-	// check if path already exists
-	dirp = opendir(fullpath.c_str());
-
-	if (dirp) {
-		// found it, return unchanged
-		closedir(dirp);
-
-		return mod_path;
+	DIR *dp;
+	if ((dp = opendir(parent.c_str())) == NULL) {
+		Warning(LOCATION, "Can't open directory '%s' when searching mod paths. Ignoring. errno=%d", parent.c_str(), errno);
+		return ret;
 	}

-	// not found, check for a difference in case
-	SCP_string new_mod_path;
-	SCP_string part;
-	struct dirent *dir;
-	SCP_string::size_type separator;
-	SCP_string::size_type offset = 0;
-
-	fullpath = SCP_string(".") + DIR_SEPARATOR_STR;
-
-	do {
-		separator = mod_path.find(DIR_SEPARATOR_CHAR, offset);
-
-		if (separator != SCP_string::npos) {
-			part = mod_path.substr(offset, separator-offset);
-			offset += separator-offset + 1;
-		} else {
-			part = mod_path.substr(offset);
-			offset += part.length();
+	dirent *dirp;
+	while ((dirp = readdir(dp)) != NULL) {
+		if (!stricmp(dirp->d_name, dir.c_str())) {
+			ret.push_back(dirp->d_name);
 		}
+	}
+	(void)closedir(dp);

-		dirp = opendir(fullpath.c_str());
+	return ret;
+}

-		if ( !dirp ) {
-			break;
-		}
+// Return a vector with all filesystem names of "parent/dir" relative to parent.
+// Recurses to deal with slashes in dir.
+static SCP_vector<SCP_string> unix_get_dir_names(const SCP_string& parent, const SCP_string& dir)
+{
+	size_t slash = dir.find_first_of("/\\");

-		while ((dir = readdir(dirp)) != nullptr) {
-			if (stricmp(dir->d_name, part.c_str())) {
-				continue;
-			}
-
-			SCP_string fn = fullpath + dir->d_name;
-
-			// make sure it accessible and a directory
-			struct stat buf;
-
-			if (stat(fn.c_str(), &buf) == -1) {
-				continue;
-			}
-
-			if ( !S_ISDIR(buf.st_mode) ) {
-				continue;
-			}
-
-			if ( !new_mod_path.empty() ) {
-				new_mod_path += DIR_SEPARATOR_STR;
-			}
-
-			new_mod_path += dir->d_name;
-
-			fullpath += dir->d_name;
-			fullpath += DIR_SEPARATOR_STR;
-
-			break;
-		}
-
-		if (dirp) {
-			closedir(dirp);
-		}
-	} while (offset < mod_path.length());
-
-	// Append anything left from mod_path onto the new path. This will catch trailing separators
-	// as well as mod folders which don't exist so that the mod string remains unchanged except
-	// for the directory name case.
-	if (new_mod_path.length() != mod_path.length()) {
-		new_mod_path += mod_path.substr(new_mod_path.length());
+	// no subdirectories, no need to recurse
+	if (slash == std::string::npos) {
+		return unix_get_single_dir_names(parent, dir);
 	}

-	return new_mod_path;
+	// get the names of the first component of dir
+	SCP_vector<SCP_string> this_dir_names = unix_get_single_dir_names(parent, dir.substr(0, slash));
+
+	SCP_string rest = dir.substr(slash + 1);
+
+	SCP_vector<SCP_string> ret;
+
+	// search for the rest of dir in each of these
+	SCP_vector<SCP_string>::iterator ii, end = this_dir_names.end();
+	for (ii = this_dir_names.begin(); ii != end; ++ii) {
+		SCP_string this_dir_path = parent + "/" + *ii;
+		SCP_vector<SCP_string> mod_path = unix_get_dir_names(this_dir_path, rest);
+
+		// add all found paths relative to parent
+		SCP_vector<SCP_string>::iterator ii2, end2 = mod_path.end();
+		for (ii2 = mod_path.begin(); ii2 != end2; ++ii2) {
+			ret.push_back(*ii + "/" + *ii2);
+		}
+	}
+
+	return ret;
 }

 // For case sensitive filesystems (e.g. Linux/BSD) perform case-insensitive dir matches.
-//
-// NOTE: Aside from change in case no alterations should be made to the modlist. Missing
-//       mod folders should be left in place and no errors or warnings should be generated.
-//       There should be no difference between Windows and non-Windows modlist handling.
 static void handle_unix_modlist(char **modlist, size_t *len)
 {
 	// search filesystem for given paths
 	SCP_vector<SCP_string> mod_paths;
-
-	for (char *cur_mod = strtok(*modlist, ","); cur_mod != NULL; cur_mod = strtok(NULL, ",")) {
-		SCP_string path = get_real_mod_path(cur_mod);
-		mod_paths.push_back(path);
+	for (char *cur_mod = strtok(*modlist, ","); cur_mod != NULL; cur_mod = strtok(NULL, ","))
+	{
+		SCP_vector<SCP_string> this_mod_paths = unix_get_dir_names(".", cur_mod);
+		// Ignore non-existing mods for unit tests
+		if (!running_unittests && this_mod_paths.empty()) {
+			ReleaseWarning(LOCATION, "Can't find mod '%s'. Ignoring.", cur_mod);
+		}
+		mod_paths.insert(mod_paths.end(), this_mod_paths.begin(), this_mod_paths.end());
 	}

 	// create new char[] to replace modlist
 	size_t total_len = 0;
-
-	for (auto &path : mod_paths) {
-		total_len += path.length() + 1;
+	SCP_vector<SCP_string>::iterator ii, end = mod_paths.end();
+	for (ii = mod_paths.begin(); ii != end; ++ii) {
+		total_len += ii->length() + 1;
 	}

 	char *new_modlist = new char[total_len + 1];
 	memset(new_modlist, 0, total_len + 1);
-
-	for (auto &path : mod_paths) {
-		strcat_s(new_modlist, total_len + 1, path.c_str());
-		strcat_s(new_modlist, total_len + 1, ",");
+	end = mod_paths.end();
+	for (ii = mod_paths.begin(); ii != end; ++ii) {
+		strcat_s(new_modlist, total_len + 1, ii->c_str());
+		strcat_s(new_modlist, total_len + 1, ","); // replace later with NUL
 	}

-	// remove trailing comma
-	new_modlist[total_len-1] = '\0';
-
 	// make the rest of the modlist manipulation unaware that anything happened here
 	delete [] *modlist;
 	*modlist = new_modlist;
@@ -1590,12 +1523,6 @@ bool SetCmdlineParams()
 {
 	//getcwd(FreeSpace_Directory, 256); // set the directory to our fs2 root

-	// DO THIS BEFORE get_flags, as portable_mode can change the value of pref_path printed in the json
-	if (portable_mode.found())
-	{
-		Cmdline_portable_mode = true;
-	}
-
 	// DO THIS FIRST to avoid unrecognized flag warnings when just getting flag file
 	if ( get_flags_arg.found() ) {
 		write_flags();
@@ -1711,7 +1638,7 @@ bool SetCmdlineParams()

 		// be sure that this string fits in our limits
 		if ( strlen(Cmdline_game_password) >= MAX_PASSWD_LEN ) {
-			ReleaseWarning(LOCATION, "Multi game password is longer than max of %d characters and will be trimmed to fit!", MAX_PASSWD_LEN-1);
+			ReleaseWarning(LOCATION, "Multi game password is longer than max of %d charaters and will be trimmed to fit!", MAX_PASSWD_LEN-1);
 			Cmdline_game_password[MAX_PASSWD_LEN-1] = '\0';
 		}
 	}
@@ -1775,48 +1702,31 @@ bool SetCmdlineParams()
 	// d3d windowed
 	if(window_arg.found()) {
 		// We need to set both values since we don't know if we are going to use the new config system
-		//options::OptionsManager::instance()->setOverride("Graphics.WindowMode", "0");
-		Cmdline_window = true;
+		options::OptionsManager::instance()->setOverride("Graphics.WindowMode", "0");
+		Cmdline_window = 1;
 	}

 	if ( fullscreen_window_arg.found( ) )
 	{
-		//options::OptionsManager::instance()->setOverride("Graphics.WindowMode", "1");
-		Cmdline_fullscreen_window = true;
-		Cmdline_window = false; /* Make sure no-one sets both */
+		options::OptionsManager::instance()->setOverride("Graphics.WindowMode", "1");
+		Cmdline_fullscreen_window = 1;
+		Cmdline_window = 0; /* Make sure no-one sets both */
 	}

-	if(render_res_arg.found() || deprecated_res_arg.found()){
-		if (render_res_arg.found()) {
-			Cmdline_res = render_res_arg.str();
-		}
-		else {
-			Cmdline_res = deprecated_res_arg.str();
-			mprintf(("Deprecated -res argument. Use -render_res instead...\n"));
-		}
+	if(res_arg.found()){
+		Cmdline_res = res_arg.str();

-		/*int width = 0;
+		int width = 0;
 		int height = 0;

-		if (sscanf(Cmdline_res, "%dx%d", &width, &height) == 2) {
+		if ( sscanf(Cmdline_res, "%dx%d", &width, &height) == 2 ) {
 			SCP_string override;
 			sprintf(override, "{\"width\":%d,\"height\":%d}", width, height);
 			options::OptionsManager::instance()->setOverride("Graphics.Resolution", override);
 		} else {
-			Warning(LOCATION, "Failed to parse -res parameter \"%s\". Must be in format \"<width>x<height>\".\n", Cmdline_res);
-		}*/
-	}
-	if(window_res_arg.found()){
-		int width = 0;
-		int height = 0;
-
-		if ( sscanf(window_res_arg.str(), "%dx%d", &width, &height) == 2 ) {
-			Cmdline_window_res.emplace(static_cast<uint16_t>(width), static_cast<uint16_t>(height));
-		} else {
-			Warning(LOCATION, "Failed to parse -window_res parameter \"%s\". Must be in format \"<width>x<height>\".\n", window_res_arg.str());
+			mprintf(("Failed to parse -res parameter \"%s\". Must be in format \"<width>x<height>\".\n", Cmdline_res));
 		}
 	}
-	
 	if(center_res_arg.found()){
 		Cmdline_center_res = center_res_arg.str();
 	}
@@ -1851,7 +1761,7 @@ bool SetCmdlineParams()
 	if(mod_arg.found() ) {
 		Cmdline_mod = mod_arg.str();

-		// strip off blank space if it's there
+		// strip off blank space it it's there
 		if ( Cmdline_mod[strlen(Cmdline_mod)-1] == ' ' ) {
 			Cmdline_mod[strlen(Cmdline_mod)-1] = '\0';
 		}
@@ -1878,14 +1788,6 @@ bool SetCmdlineParams()
 		Cmdline_mod = modlist;
 	}

-	if(campaign_arg.found()) {
-		Cmdline_campaign = campaign_arg.str();
-
-		// strip off blank space if it's there
-		if ( Cmdline_campaign[strlen(Cmdline_campaign)-1] == ' ' ) {
-			Cmdline_campaign[strlen(Cmdline_campaign)-1] = '\0';
-		}
-	}

 	if (fps_arg.found())
 	{
@@ -1902,6 +1804,10 @@ bool SetCmdlineParams()
 		Cmdline_show_pos = 1;
 	}

+	if ( nomotiondebris_arg.found() ) {
+		Motion_debris_enabled = false;
+	}
+
 	if( mipmap_arg.found() ) {
 		Cmdline_mipmap = 1;
 	}
@@ -1915,7 +1821,7 @@ bool SetCmdlineParams()
 		if (val > 0.1) {
 			VIEWER_ZOOM_DEFAULT = val;
 		} else {
-			VIEWER_ZOOM_DEFAULT = DEFAULT_FOV;
+			VIEWER_ZOOM_DEFAULT = 0.75f;
 		}
 	}

@@ -1929,31 +1835,8 @@ bool SetCmdlineParams()
 		}
 	}

-	if (vr.found()) {
-		Cmdline_enable_vr = true;
-		if (fov_arg.found() || fov_cockpit_arg.found()) {
-			Warning(LOCATION, "FoV Command line settings found. VR-Mode will override these with the HMD's native FoV...");
-		}
-
-		// enable other settings to allow VR to work more seamlessly  
-		mprintf(("VR-Mode enabled, so forcing on the following settings: capture_mouse, window_res 1000x1000, window, no_vsync \n"));
-
-		// ensure ingame resolution is set to sensible values in VR mode, 
-		// which will exceed the resolution otherwise shown and is not dependent on the monitor resolution
-		Cmdline_capture_mouse = true;
-		Cmdline_window_res.emplace(static_cast<uint16_t>(1000), static_cast<uint16_t>(1000));
-
-		Cmdline_fullscreen_window = false;
-		Cmdline_window = true; /* Make sure no-one sets both */
-		removeWindowModeOption();
-
-		// Turn off VSync, since we definitely don't want to be capped by the main monitor
-		// the OpenXR runtime should have a buffered wait which will behave, effectively,
-		// as a VSync to VR goggle driver
-		Gr_enable_vsync = false;
-		removeVSyncOption();
-
-		openxr_prepare();
+	if( clip_dist_arg.found() ) {
+		Min_draw_distance = Cmdline_clip_dist = clip_dist_arg.get_float();
 	}

 	if (orb_radar.found())
@@ -1961,20 +1844,28 @@ bool SetCmdlineParams()
 		Cmdline_orb_radar = 1;
 	}

+	if ( use_3dwarp.found() ) {
+		Fireball_use_3d_warp = true;
+	}
+
+	if ( use_warp_flash.found() ) {
+		Fireball_warp_flash = true;
+	}
+
 	if ( allow_autpilot_interrupt.found() )	{
 		Cmdline_autopilot_interruptable = 0;
 	}
+
+	if ( no_screenshake.found() ) {
+		Cmdline_no_screenshake = 1;
+	}
 	
 	if ( deadzone.found() ) {
 		Cmdline_deadzone = deadzone.get_int();
 	}

 	if ( stretch_menu.found() )	{
-		Cmdline_stretch_menu = true;
-	}
-
-	if ( capture_mouse.found() ) {
-		Cmdline_capture_mouse = true;
+		Cmdline_stretch_menu = 1;
 	}
 	// new lighting lines
 	if ( ambient_power_arg.found() )
@@ -1999,10 +1890,6 @@ bool SetCmdlineParams()
 		Cmdline_no_set_gamma = 1;
 	}

-	if (no_ingame_options_arg.found()) {
-		Cmdline_no_ingame_options = true;
-	}
-
 	if(no_vsync_arg.found() )
 	{
 		Gr_enable_vsync = false;
@@ -2046,21 +1933,6 @@ bool SetCmdlineParams()
 		}
 	}

-	if (msaa_enabled_arg.found()) {
-		Cmdline_msaa_enabled = msaa_enabled_arg.get_int();
-		switch (Cmdline_msaa_enabled) {
-		case 0:
-		case 4:
-		case 8:
-		case 16:
-			break;
-		default:
-			Warning(LOCATION, "Requested illegal MSAA sample count %d. Allowed are: 0, 4, 8, 16. Setting to 0.", Cmdline_msaa_enabled);
-			Cmdline_msaa_enabled = 0;
-			break;
-		}
-	}
-
 	if ( glow_arg.found() )
 		Cmdline_glow = 0;

@@ -2077,9 +1949,6 @@ bool SetCmdlineParams()
 	if (output_script_json_arg.found() )
 		Output_scripting_json = true;

-	if (output_script_luastub_arg.found())
-		Output_scripting_luastub = true;
-
 	if (output_sexp_arg.found() ) {
 		Cmdline_output_sexp_info = true;
 	}
@@ -2127,18 +1996,10 @@ bool SetCmdlineParams()
 		Cmdline_noshadercache = true;
 	}

-	if (lang_arg.found()) 
+	if (portable_mode.found())
 	{
-		Cmdline_lang = lang_arg.str();
+		Cmdline_portable_mode = true;
 	}
-
-	if (no_bsp_align_arg.found()) {
-		Cmdline_no_bsp_align = true;
-	}
-
-    if (no_large_shaders.found()) {
-        Cmdline_no_large_shaders = true;
-    }
 	
 #ifdef WIN32
 	if (fix_registry.found()) {
@@ -2181,6 +2042,11 @@ bool SetCmdlineParams()
        Cmdline_ati_color_swap = 1;
    }

+	if ( enable_3d_shockwave_arg.found() )
+	{
+		Cmdline_enable_3d_shockwave = 1;
+	}
+
 	if ( softparticles_arg.found() )
 	{
 		Cmdline_softparticles = 1;
@@ -2201,6 +2067,16 @@ bool SetCmdlineParams()
 		Gr_post_processing_enabled = false;
 	}

+	if ( bloom_intensity_arg.found() )
+	{
+		Cmdline_bloom_intensity = bloom_intensity_arg.get_int();
+	}
+
+	if ( flightshaftsoff_arg.found() )
+	{
+		Cmdline_force_lightshaft_off = true;
+	}
+
 	if( reparse_mainhall_arg.found() )
 	{
 		Cmdline_reparse_mainhall = 1;
@@ -2266,11 +2142,6 @@ bool SetCmdlineParams()
 	{
 		Cmdline_no_unfocus_pause = true;
 	}
-
-	if (retail_time_compression_range_arg.found())
-	{
-		Cmdline_retail_time_compression_range = true;
-	}
 	
 	if (benchmark_mode_arg.found())
 	{
@@ -2329,10 +2200,6 @@ bool SetCmdlineParams()
 		Cmdline_show_video_info = true;
 	}

-	if (vulkan.found()) {
-		Cmdline_vulkan = true;
-	}
-
 	//Deprecated flags - CommanderDJ
 	if (deprecated_no_emissive_arg.found()) {
 		Cmdline_emissive = 0;
@@ -6,13 +6,12 @@
 * source.
 *

-*/
+*/ 


 #ifndef FS_CMDLINE_HEADER_FILE
 #define FS_CMDLINE_HEADER_FILE

-#include <optional>

 int parse_cmdline(int argc, char *argv[]);

@@ -34,6 +33,7 @@ extern int Cmdline_cd_check;
 extern int Cmdline_closed_game;
 extern int Cmdline_freespace_no_music;
 extern int Cmdline_freespace_no_sound;
+extern int Cmdline_gimme_all_medals;
 extern int Cmdline_mouse_coords;
 extern int Cmdline_multi_log;
 extern int Cmdline_multi_stream_chat_to_file;
@@ -43,16 +43,16 @@ extern int Cmdline_spew_pof_info;
 extern int Cmdline_start_netgame;
 extern int Cmdline_timeout;
 extern int Cmdline_use_last_pilot;
-extern bool Cmdline_window;
-extern bool Cmdline_fullscreen_window;
+extern int Cmdline_window;
+extern int Cmdline_fullscreen_window;
 extern char *Cmdline_res;
-extern std::optional<std::pair<uint16_t, uint16_t>>Cmdline_window_res;
 extern char *Cmdline_center_res;


 // FSO OPTIONS -------------------------------------------------

 // Graphics related
+extern float Cmdline_clip_dist;
 extern float Cmdline_ambient_power;
 extern float Cmdline_emissive_power;
 extern float Cmdline_light_power;
@@ -62,16 +62,18 @@ extern int Cmdline_noscalevid;	// disables fit-to-window for movies - taylor
 extern int Cmdline_spec;
 extern int Cmdline_normal;
 extern int Cmdline_height;
+extern int Cmdline_enable_3d_shockwave;
 extern int Cmdline_softparticles;
+extern int Cmdline_bloom_intensity;
+extern bool Cmdline_force_lightshaft_off;
 extern int Cmdline_no_deferred_lighting;
 extern bool Cmdline_deferred_lighting_cockpit;
 extern int Cmdline_emissive;
 extern int Cmdline_aniso_level;
-extern int Cmdline_msaa_enabled;

 // Game Speed related
 extern int Cmdline_NoFPSCap;
-extern bool Cmdline_no_vsync;
+extern int Cmdline_no_vsync;

 // HUD related
 extern int Cmdline_ballistic_gauge;
@@ -80,11 +82,12 @@ extern int Cmdline_orb_radar;
 extern int Cmdline_rearm_timer;

 // Gameplay related
+extern int Cmdline_ship_choice_3d;
+extern int Cmdline_weapon_choice_3d;
 extern int Cmdline_autopilot_interruptable;
-extern bool Cmdline_stretch_menu;
-extern bool Cmdline_capture_mouse;
+extern int Cmdline_stretch_menu;
+extern int Cmdline_no_screenshake;
 extern int Cmdline_deadzone;
-extern bool Cmdline_enable_vr;

 // Audio related
 extern int Cmdline_voice_recognition;
@@ -92,7 +95,6 @@ extern int Cmdline_no_enhanced_sound;

 // MOD related
 extern char *Cmdline_mod;	 // DTP for mod support
-extern char *Cmdline_campaign;	 // for campaign support
 // Multiplayer/Network related
 extern char *Cmdline_almission;	// DTP for autoload mission (for multi only)
 extern int Cmdline_ingamejoin;
@@ -102,13 +104,11 @@ extern char *Cmdline_gateway_ip;

 // Launcher related options
 extern bool Cmdline_portable_mode;
-extern SCP_string Cmdline_lang;

 // Troubleshooting
 extern int Cmdline_load_all_weapons;
 extern int Cmdline_nomovies;	// WMC Toggles movie playing support
 extern int Cmdline_no_set_gamma;
-extern bool Cmdline_no_ingame_options;
 extern int Cmdline_no_fbo;
 extern int Cmdline_no_pbo;
 extern int Cmdline_mipmap;
@@ -124,7 +124,6 @@ extern bool Cmdline_noshadercache;
 extern bool Cmdline_prefer_ipv4;
 extern bool Cmdline_prefer_ipv6;
 extern bool Cmdline_dump_packet_type;
-extern bool Cmdline_no_large_shaders;
 #ifdef WIN32
 extern bool Cmdline_alternate_registry_path;
 #endif
@@ -144,7 +143,6 @@ extern int Cmdline_verify_vps;
 extern int Cmdline_reparse_mainhall;
 extern bool Cmdline_profile_write_file;
 extern bool Cmdline_no_unfocus_pause;
-extern bool Cmdline_retail_time_compression_range;
 extern bool Cmdline_benchmark_mode;
 extern const char *Cmdline_pilot;
 extern bool Cmdline_noninteractive;
@@ -158,14 +156,9 @@ extern bool Cmdline_slow_frames_ok;
 extern bool Cmdline_lua_devmode;
 extern bool Cmdline_override_data;
 extern bool Cmdline_show_imgui_debug;
-extern bool Cmdline_vulkan;

 enum class WeaponSpewType { NONE = 0, STANDARD, ALL };
 extern WeaponSpewType Cmdline_spew_weapon_stats;

-extern void removeVSyncOption();
-extern void removeWindowModeOption();
-extern void removeResolutionOption();
-extern void removeResolutionVROption();

 #endif
@@ -51,14 +51,6 @@ void cmeasure_set_ship_launch_vel(object *objp, object *parent_objp, int arand)

 	objp->phys_info.max_vel.xyz.z = -25.0f;
 	vm_vec_copy_scale(&objp->phys_info.desired_vel, &objp->orient.vec.fvec, objp->phys_info.max_vel.xyz.z );
-
-	// if this cmeasure has a single segment trail, let the trail know since we just changed the velocity
-	// yeah this is hacky but that's what this function gets for CHANGING the velocity on objects with a ""CONSTANT VELOCITY""
-	weapon* wp = &Weapons[objp->instance];
-	if (wp->trail_ptr && wp->trail_ptr->single_segment) {
-		wp->trail_ptr->vel[0] = objp->phys_info.vel;
-		wp->trail_ptr->vel[1] = objp->phys_info.vel;
-	}
 }

 /** 
@@ -36,10 +36,8 @@ enum Joy_axis_index : short {
 	JOY_RX_AXIS,
 	JOY_RY_AXIS,
 	JOY_RZ_AXIS,
-	JOY_U_AXIS,
-	JOY_V_AXIS,

-	JOY_NUM_AXES	//!< Max number of joy axes that FSO can handle. Must be last enum in Joy_axis_index.
+	JOY_NUM_AXES	// Number of axes a joystick may have. Must be last enum in Joy_axis_index.
 };

 // Aliases for mouse axes.  Really should unify this...
@@ -299,8 +297,6 @@ enum IoActionId : int {

 	TOGGLE_HUD_SHADOWS,

-	CYCLE_PRIMARY_WEAPON_PATTERN,
-
 	/*!
 	 * This must always be below the last defined item
 	 */
@@ -437,26 +433,6 @@ private:
 	short btn = -1;     //!< The button, key combo, or axis that's bound.
 };

-/**
- * @struct cc_line
- * @brief Defines an interactable line to display control names and their bindings
- */
-struct cc_line {
-	const char* label;
-	int cc_index;       // index into Control_config of item
-	int y;              // Y coordinate of line
-	int kx, kw, jx, jw; // x start and width of keyboard and joystick bound text
-};
-
-/**
- * @struct conflict
- * @brief Defines an conflict between bindings
- */
-struct conflict {
-	int first = -1;  // index of other control in conflict with this one
-	int second = -1; // index of other control in conflict with this one
-};
-
 /*!
 * A pair of bindings.
 * @note Please don't set the bindings directly, use ::take() instead.
@@ -561,7 +537,7 @@ class CC_preset {
 public:
 	SCP_vector<CCB> bindings;
 	SCP_string name;
-	Preset_t type = Preset_t::hardcode;
+	Preset_t type;

 public:
 	CC_preset() = default;
@@ -665,15 +641,6 @@ private:
 	SCP_vector<CCI>& ControlConfig;
 };

-enum class selItem : int {
-	selItem_REND, // Must be first to allow cycling
-
-	None,
-	Primary,
-	Secondary,
-
-	selItem_END // Must be last to allow cycling
-};

 extern int Failed_key_index;

@@ -682,11 +649,9 @@ extern int Joy_sensitivity;

 extern int Control_config_overlay_id;

-extern SCP_vector<cc_line> Cc_lines; //!< Stores the keyboard details for the UI
-extern SCP_vector<conflict> Conflicts; //!< Stores conflict data for the keybinds
-
 extern SCP_vector<CCI> Control_config;		//!< Stores the keyboard configuration
 extern SCP_vector<CC_preset> Control_config_presets; // tabled control presets; pointers to config_item arrays
+extern const char **Joy_button_text;			// String table of button labels.  XSTR'd on init.

 extern bool Generate_controlconfig_table;

@@ -724,7 +689,7 @@ void control_config_common_close();
 /*!
 * @brief init config menu
 */
-void control_config_init(bool API_Access = false);
+void control_config_init();

 /*!
 * @brief do a frame of the config menu
@@ -734,73 +699,12 @@ void control_config_do_frame(float frametime);
 /*!
 * @brief close config menu
 */
-void control_config_close(bool API_Access = false);
-
-/*!
- * @brief setup for binding a control
- */
-void control_config_do_bind(bool API_Access = false);
-
-/*!
- * @brief setup for searching a control
- */
-void control_config_do_search(bool API_Access = false);
-
-/**
- * @brief Unbinds the selected control
- */
-bool control_config_remove_binding(int ctrl, selItem item, bool API_Access = false);
-
-/**
- * @brief Clears all conflicting control bindings, except the selected control
- */
-bool control_config_clear_other(int ctrl, bool API_Access = false);
-
-/**
- * @brief Unbinds ALL controls
- * TODO: unbind axes and reset inversion
- */
-bool control_config_clear_all(bool API_Access = false);
-
-/**
- * @brief Reverts all bindings to their preset. If already default, cycle to the next presets.
- */
-bool control_config_do_reset(bool cycle = true, bool API_Access = false);
-
-/**
- * @brief Toggles a modifier on or off for a control binding
- */
-bool control_config_toggle_modifier(int bit, int ctrl, bool API_Access = false);
-
-/**
- * @brief Toggles inversion for the selected axis control
- */
-bool control_config_toggle_invert(int ctrl, selItem item, bool API_Access = false);
-
-/*!
- * @brief Performs a single undo opration, reverting the most recent change to bindings, if any
- */
-void control_config_do_undo(bool API_Access = false);
-
-/*!
- *@brief Runs every frame to check for input and binds the input if appropriate
- */
-int control_config_bind_key_on_frame(int ctrl, selItem item, bool API_Access = false);
-
-/*!
- *@brief Runs every frame to check for input. Returns the index of the item the key is bound to or -1 if nothing.
- */
-int control_config_search_key_on_frame(bool API_Access = false);
-
-/*!
- * Does a cursory conflict check, then accepts changes to the bindings, if any, and request the menu to close.
- */
-bool control_config_accept(bool API_Access = false);
+void control_config_close();

 /*!
 * @brief Cancel configuration of controls, revert any changes, return to previous menu/game state
 */
-void control_config_cancel_exit(bool API_Access = false);
+void control_config_cancel_exit();

 /*!
 * @brief Copies all bindings within preset into Control_config
@@ -831,30 +735,6 @@ bool control_config_use_preset_by_name(const SCP_string &name);

 SCP_vector<CC_preset>::iterator control_config_get_current_preset(bool invert_agnostic = false);

-/*!
- * @brief Deletes the preset
- * 
- * @returns TRUE if successful
- * @returns FALSE if the preset is default or currently selected
- */
-bool control_config_delete_preset(CC_preset preset);
-
-/*!
- * @brief Clones a preset
- *
- * @returns TRUE if successful
- * @returns FALSE if the preset already exists with that name
- */
-bool control_config_clone_preset(const CC_preset& preset, const SCP_string& name, bool overwrite);
-
-/*!
- * @brief Saves a preset with the current controls
- *
- * @returns TRUE if successful
- * @returns FALSE if the preset already exists with that name
- */
-bool control_config_create_new_preset(const SCP_string& name, bool overwrite);
-
 /*!
 * Returns the IoActionId (index within Control_config[]) of a control bound to the given key
 *
@@ -911,18 +791,7 @@ const char *textify_scancode(int code);
 */
 const char *textify_scancode_universal(int code);

-/**
- * @brief Creates a button label based on btn index and locale settings.
- * 
- * @param[in]   btn The btn to textify
- * 
- * @return The text representation of the btn
- * 
- * @note Not thread safe.  Has an internal buffer for the return value which is overwritten on each call.
- */
-const char* textify_button(int btn);
-
-	/*!
+/*!
 * @brief Checks how long a control has been active
 *
 * @param[in] id The IoActionId of the control to check
@@ -961,7 +830,7 @@ int check_control(int id, int key = -1);
 void control_get_axes_readings(int *axis_v, float frame_time);

 /**
- * @brief Marks the given control (by IoActionId) as used
+ * @brief Markes the given control (by IoActionId) as used
 *
 * @details Updates the ::used timestamp, triggers a script hook, and marks ::continous_ongoing as true
 */
@@ -45,31 +45,27 @@ int Failed_key_index;
 // Joystick configuration
 int Joy_dead_zone_size = 10;

-auto DeadZoneOption = options::OptionBuilder<int>("Input.JoystickDeadZone",
-                     std::pair<const char*, int>{"Deadzone", 1377},
-                     std::pair<const char*, int>{"The deadzone used for all joysticks", 1744})
-                     .category(std::make_pair("Input", 1827))
-                     .range(0, 45)
-                     .level(options::ExpertLevel::Beginner)
-                     .default_val(10)
-                     .bind_to(&Joy_dead_zone_size)
-                     .importance(1)
-                     .flags({options::OptionFlags::RetailBuiltinOption})
-                     .finish();
+auto DeadZoneOption =
+    options::OptionBuilder<int>("Input.JoystickDeadZone", "Deadzone", "The deadzone of the selected joystick.")
+        .category("Input")
+        .range(0, 45)
+        .level(options::ExpertLevel::Beginner)
+        .default_val(10)
+        .bind_to(&Joy_dead_zone_size)
+        .importance(1)
+        .finish();

 int Joy_sensitivity = 9;

-auto SensitivityOption = options::OptionBuilder<int>("Input.JoystickSensitivity",
-                     std::pair<const char*, int>{"Sensitivity", 1745},
-                     std::pair<const char*, int>{"The sensitivity used for all joysticks", 1746})
-                     .category(std::make_pair("Input", 1827))
-                     .range(0, 9)
-                     .level(options::ExpertLevel::Beginner)
-                     .default_val(9)
-                     .bind_to(&Joy_sensitivity)
-                     .importance(2)
-                     .flags({options::OptionFlags::RetailBuiltinOption})
-                     .finish();
+auto SensitivityOption =
+    options::OptionBuilder<int>("Input.JoystickSensitivity", "Sensitivity", "The sentitivity of the selected joystick.")
+        .category("Input")
+        .range(0, 9)
+        .level(options::ExpertLevel::Beginner)
+        .default_val(9)
+        .bind_to(&Joy_sensitivity)
+        .importance(2)
+        .finish();

 //! arrays which hold the key mappings.  The array index represents a key-independent action.
 //! please use SPACES for aligning the fields of this array
@@ -162,8 +158,8 @@ void control_config_common_init_bindings() {
 	// flight controls (flight modes)
 	(BANK_WHEN_PRESSED,                                      -1, -1, SHIP_TAB, 1, "Bank When Pressed",  CC_TYPE_CONTINUOUS)
 	(AFTERBURNER,                                       KEY_TAB,  5, SHIP_TAB, 1, "Afterburner",        CC_TYPE_CONTINUOUS)
-	(GLIDE_WHEN_PRESSED,                                     -1, -1, SHIP_TAB, 1774, "Glide When Pressed", CC_TYPE_CONTINUOUS)
-	(TOGGLE_GLIDING,                          KEY_ALTED | KEY_G, -1, SHIP_TAB, 1775, "Toggle Gliding",     CC_TYPE_TRIGGER)
+	(GLIDE_WHEN_PRESSED,                                     -1, -1, SHIP_TAB, 0, "Glide When Pressed", CC_TYPE_CONTINUOUS)
+	(TOGGLE_GLIDING,                          KEY_ALTED | KEY_G, -1, SHIP_TAB, 0, "Toggle Gliding",     CC_TYPE_TRIGGER)

 	// flight controls (axes)
 	(JOY_HEADING_AXIS,                     JOY_X_AXIS, MOUSE_X_AXIS, SHIP_TAB, 1016, "Turn (Yaw) Axis",        CC_TYPE_AXIS_REL)
@@ -177,8 +173,7 @@ void control_config_common_init_bindings() {
 	(FIRE_SECONDARY,                               KEY_SPACEBAR,  1, WEAPON_TAB, 1, "Fire Secondary Weapon",                  CC_TYPE_CONTINUOUS)
 	(CYCLE_NEXT_PRIMARY,                             KEY_PERIOD, -1, WEAPON_TAB, 1, "Cycle Primary Weapon Forward",           CC_TYPE_TRIGGER)
 	(CYCLE_PREV_PRIMARY,                              KEY_COMMA, -1, WEAPON_TAB, 1, "Cycle Primary Weapon Backward",          CC_TYPE_TRIGGER)
-	(CYCLE_PRIMARY_WEAPON_SEQUENCE,                       KEY_O, -1, WEAPON_TAB, 1776, "Cycle Primary Weapon Firing Rate",       CC_TYPE_TRIGGER)
-	(CYCLE_PRIMARY_WEAPON_PATTERN,			  KEY_ALTED | KEY_O, -1, WEAPON_TAB, 1859, "Cycle Primary Weapon Firing Pattern",	  CC_TYPE_TRIGGER)
+	(CYCLE_PRIMARY_WEAPON_SEQUENCE,                       KEY_O, -1, WEAPON_TAB, 0, "Cycle Primary Weapon Firing Rate",       CC_TYPE_TRIGGER)
 	(CYCLE_SECONDARY,                                KEY_DIVIDE, -1, WEAPON_TAB, 1, "Cycle Secondary Weapon Forward",         CC_TYPE_TRIGGER)
 	(CYCLE_NUM_MISSLES,                KEY_SHIFTED | KEY_DIVIDE, -1, WEAPON_TAB, 1, "Cycle Secondary Weapon Firing Rate",     CC_TYPE_TRIGGER)
 	(LAUNCH_COUNTERMEASURE,                               KEY_X,  3, WEAPON_TAB, 1, "Launch Countermeasure",                  CC_TYPE_TRIGGER)
@@ -210,12 +205,12 @@ void control_config_common_init_bindings() {
 	(VIEW_DIST_INCREASE,                            KEY_PADPLUS, -1, COMPUTER_TAB, 1, "Increase View Distance",             CC_TYPE_CONTINUOUS)
 	(VIEW_DIST_DECREASE,                           KEY_PADMINUS, -1, COMPUTER_TAB, 1, "Decrease View Distance",             CC_TYPE_CONTINUOUS)
 	(VIEW_CENTER,                                      KEY_PAD5, -1, COMPUTER_TAB, 1, "Center View",                        CC_TYPE_CONTINUOUS)
-	(PADLOCK_UP,                                             -1, iHAT_UP,       COMPUTER_TAB, 1, "View Up",                            CC_TYPE_CONTINUOUS)
-	(PADLOCK_DOWN,                                           -1, iHAT_DOWN,     COMPUTER_TAB, 1, "View Rear",                          CC_TYPE_CONTINUOUS)
-	(PADLOCK_LEFT,                                           -1, iHAT_LEFT,     COMPUTER_TAB, 1, "View Left",                          CC_TYPE_CONTINUOUS)
-	(PADLOCK_RIGHT,                                          -1, iHAT_RIGHT,    COMPUTER_TAB, 1, "View Right",                         CC_TYPE_CONTINUOUS)
-	(VIEW_TOPDOWN,                                           -1, -1, COMPUTER_TAB, 1777, "Top-Down View",                      CC_TYPE_TRIGGER)
-	(VIEW_TRACK_TARGET,                                      -1, -1, COMPUTER_TAB, 1778, "Target Padlock View",                CC_TYPE_TRIGGER)
+	(PADLOCK_UP,                                             -1, 33, COMPUTER_TAB, 1, "View Up",                            CC_TYPE_CONTINUOUS)
+	(PADLOCK_DOWN,                                           -1, 32, COMPUTER_TAB, 1, "View Rear",                          CC_TYPE_CONTINUOUS)
+	(PADLOCK_LEFT,                                           -1, 34, COMPUTER_TAB, 1, "View Left",                          CC_TYPE_CONTINUOUS)
+	(PADLOCK_RIGHT,                                          -1, 35, COMPUTER_TAB, 1, "View Right",                         CC_TYPE_CONTINUOUS)
+	(VIEW_TOPDOWN,                                           -1, -1, COMPUTER_TAB, 0, "Top-Down View",                      CC_TYPE_TRIGGER)
+	(VIEW_TRACK_TARGET,                                      -1, -1, COMPUTER_TAB, 0, "Target Padlock View",                CC_TYPE_TRIGGER)

 	(RADAR_RANGE_CYCLE,                            KEY_RAPOSTRO, -1, COMPUTER_TAB, 1, "Cycle Radar Range",                 CC_TYPE_TRIGGER)
 	(SQUADMSG_MENU,                                       KEY_C, -1, COMPUTER_TAB, 1, "Communications Menu",               CC_TYPE_TRIGGER)
@@ -240,8 +235,8 @@ void control_config_common_init_bindings() {

 	// Navigation and Autopilot
 	(SHOW_NAVMAP,                                            -1, -1, NO_TAB,       1, "Show Nav Map",       CC_TYPE_TRIGGER, true)
-	(AUTO_PILOT_TOGGLE,                       KEY_ALTED | KEY_A, -1, COMPUTER_TAB, 1779, "Toggle Auto Pilot",  CC_TYPE_TRIGGER)
-	(NAV_CYCLE,                               KEY_ALTED | KEY_N, -1, COMPUTER_TAB, 1780, "Cycle Nav Points",   CC_TYPE_TRIGGER)
+	(AUTO_PILOT_TOGGLE,                       KEY_ALTED | KEY_A, -1, COMPUTER_TAB, 0, "Toggle Auto Pilot",  CC_TYPE_TRIGGER)
+	(NAV_CYCLE,                               KEY_ALTED | KEY_N, -1, COMPUTER_TAB, 0, "Cycle Nav Points",   CC_TYPE_TRIGGER)

 	// Escort
 	(ADD_REMOVE_ESCORT,                       KEY_ALTED | KEY_E, -1, COMPUTER_TAB, 1, "Add or Remove Escort",   CC_TYPE_TRIGGER)
@@ -263,15 +258,15 @@ void control_config_common_init_bindings() {
 	// HUD
 	(TOGGLE_HUD,                                    KEY_SHIFTED | KEY_O, -1, COMPUTER_TAB, 1, "Toggle HUD",                       CC_TYPE_TRIGGER)
 	(TOGGLE_HUD_CONTRAST,                                         KEY_L, -1, COMPUTER_TAB, 1, "Toggle High HUD Contrast",         CC_TYPE_TRIGGER)
-	(TOGGLE_HUD_SHADOWS,                              KEY_ALTED | KEY_L, -1, COMPUTER_TAB, 1781, "Toggle HUD Drop Shadows",          CC_TYPE_TRIGGER)
+	(TOGGLE_HUD_SHADOWS,                              KEY_ALTED | KEY_L, -1, COMPUTER_TAB, 0, "Toggle HUD Drop Shadows",          CC_TYPE_TRIGGER)
 	(HUD_TARGETBOX_TOGGLE_WIREFRAME,    KEY_ALTED | KEY_SHIFTED | KEY_Q, -1, COMPUTER_TAB, 1, "Toggle HUD Wireframe Target View", CC_TYPE_TRIGGER)

 	// Custom Controls
-	(CUSTOM_CONTROL_1,                  KEY_ALTED | KEY_SHIFTED | KEY_1, -1, COMPUTER_TAB, 1784, "Custom Control 1", CC_TYPE_TRIGGER, true)
-	(CUSTOM_CONTROL_2,                  KEY_ALTED | KEY_SHIFTED | KEY_2, -1, COMPUTER_TAB, 1785, "Custom Control 2", CC_TYPE_TRIGGER, true)
-	(CUSTOM_CONTROL_3,                  KEY_ALTED | KEY_SHIFTED | KEY_3, -1, COMPUTER_TAB, 1786, "Custom Control 3", CC_TYPE_TRIGGER, true)
-	(CUSTOM_CONTROL_4,                  KEY_ALTED | KEY_SHIFTED | KEY_4, -1, COMPUTER_TAB, 1787, "Custom Control 4", CC_TYPE_TRIGGER, true)
-	(CUSTOM_CONTROL_5,                  KEY_ALTED | KEY_SHIFTED | KEY_5, -1, COMPUTER_TAB, 1788, "Custom Control 5", CC_TYPE_TRIGGER, true)
+	(CUSTOM_CONTROL_1,                  KEY_ALTED | KEY_SHIFTED | KEY_1, -1, COMPUTER_TAB, 0, "Custom Control 1", CC_TYPE_TRIGGER, true)
+	(CUSTOM_CONTROL_2,                  KEY_ALTED | KEY_SHIFTED | KEY_2, -1, COMPUTER_TAB, 0, "Custom Control 2", CC_TYPE_TRIGGER, true)
+	(CUSTOM_CONTROL_3,                  KEY_ALTED | KEY_SHIFTED | KEY_3, -1, COMPUTER_TAB, 0, "Custom Control 3", CC_TYPE_TRIGGER, true)
+	(CUSTOM_CONTROL_4,                  KEY_ALTED | KEY_SHIFTED | KEY_4, -1, COMPUTER_TAB, 0, "Custom Control 4", CC_TYPE_TRIGGER, true)
+	(CUSTOM_CONTROL_5,                  KEY_ALTED | KEY_SHIFTED | KEY_5, -1, COMPUTER_TAB, 0, "Custom Control 5", CC_TYPE_TRIGGER, true)
 	.end();	// Builder

 	// init default preset
@@ -432,7 +427,6 @@ SCP_unordered_map<SCP_string, IoActionId> old_text = {
 	{"Cycle Nav Points",                        NAV_CYCLE},
 	{"Toggle Gliding",                          TOGGLE_GLIDING},
 	{"Cycle Primary Weapon Firing Rate",        CYCLE_PRIMARY_WEAPON_SEQUENCE},
-	{"Cycle Primary Weapon Firing Pattern",		CYCLE_PRIMARY_WEAPON_PATTERN},
 	{"Custom Control 1",                        CUSTOM_CONTROL_1},
 	{"Custom Control 2",                        CUSTOM_CONTROL_2},
 	{"Custom Control 3",                        CUSTOM_CONTROL_3},
@@ -440,38 +434,67 @@ SCP_unordered_map<SCP_string, IoActionId> old_text = {
 	{"Custom Control 5",                        CUSTOM_CONTROL_5},
 };

-// Localization strings for hat positions. Back[0], Forward[1], Left[2], Right[3]
-// This ordering is used to follow the same logic as hatBtnToEnum in joy-sdl.cpp
-const char* Joy_hat_text_german_u[JOY_NUM_HAT_POS] = {
-	"Hut Hinten", "Hut Vorne", "Hut Links", "Hut Rechts"
+const char* Joy_button_text_german_u[] = {
+	"Knopf 1",		"Knopf 2",		"Knopf 3",		"Knopf 4",		"Knopf 5",		"Knopf 6",
+	"Knopf 7",		"Knopf 8",		"Knopf 9",		"Knopf 10",		"Knopf 11",		"Knopf 12",
+	"Knopf 13",		"Knopf 14",		"Knopf 15",		"Knopf 16",		"Knopf 17",		"Knopf 18",
+	"Knopf 19",		"Knopf 20",		"Knopf 21",		"Knopf 22",		"Knopf 23",		"Knopf 24",
+	"Knopf 25",		"Knopf 26",		"Knopf 27",		"Knopf 28",		"Knopf 29",		"Knopf 30",
+	"Knopf 31",		"Knopf 32",		"Hut Hinten",	"Hut Vorne",	"Hut Links",	"Hut Rechts"
 };

-const char* Joy_hat_text_french_u[JOY_NUM_HAT_POS] = {
-	("Chapeau Arri\xc3\xa8""re"), "Chapeau Avant", "Chapeau Gauche", "Chapeau Droite"
+const char* Joy_button_text_french_u[] = {
+	"Bouton 1",		"Bouton 2",		"Bouton 3",		"Bouton 4",		"Bouton 5",		"Bouton 6",
+	"Bouton 7",		"Bouton 8",		"Bouton 9",		"Bouton 10",		"Bouton 11",		"Bouton 12",
+	"Bouton 13",		"Bouton 14",		"Bouton 15",		"Bouton 16",		"Bouton 17",		"Bouton 18",
+	"Bouton 19",		"Bouton 20",		"Bouton 21",		"Bouton 22",		"Bouton 23",		"Bouton 24",
+	"Bouton 25",		"Bouton 26",		"Bouton 27",		"Bouton 28",		"Bouton 29",		"Bouton 30",
+	"Bouton 31",		"Bouton 32",		"Chapeau Arri\xc3\xa8""re",		"Chapeau Avant",		"Chapeau Gauche",		"Chapeau Droite"
 };

-const char* Joy_hat_text_polish_u[JOY_NUM_HAT_POS] = {
-	"Hat Ty\xc5\x82", ("Hat Prz\xc3\xb3""d"), "Hat Lewo", "Hat Prawo"
+const char* Joy_button_text_polish_u[] = {
+	"Przyc.1",		"Przyc.2",		"Przyc.3",		"Przyc.4",		"Przyc.5",		"Przyc.6",
+	"Przyc.7",		"Przyc.8",		"Przyc.9",		"Przyc.10",	"Przyc.11",	"Przyc.12",
+	"Przyc.13",	"Przyc.14",	"Przyc.15",	"Przyc.16",	"Przyc.17",	"Przyc.18",
+	"Przyc.19",	"Przyc.20",	"Przyc.21",	"Przyc.22",	"Przyc.23",	"Przyc.24",
+	"Przyc.25",	"Przyc.26",	"Przyc.27",	"Przyc.28",	"Przyc.29",	"Przyc.30",
+	"Przyc.31",	"Przyc.32",	"Hat Ty\xc5\x82",		"Hat Prz\xc3\xb3""d",	"Hat Lewo",		"Hat Prawo"
 };

-const char* Joy_hat_text_english_u[JOY_NUM_HAT_POS] = {
-	"Hat Back", "Hat Forward", "Hat Left", "Hat Right"
+const char* Joy_button_text_english_u[] = {
+	"Button 1",		"Button 2",		"Button 3",		"Button 4",		"Button 5",		"Button 6",
+	"Button 7",		"Button 8",		"Button 9",		"Button 10",	"Button 11",	"Button 12",
+	"Button 13",	"Button 14",	"Button 15",	"Button 16",	"Button 17",	"Button 18",
+	"Button 19",	"Button 20",	"Button 21",	"Button 22",	"Button 23",	"Button 24",
+	"Button 25",	"Button 26",	"Button 27",	"Button 28",	"Button 29",	"Button 30",
+	"Button 31",	"Button 32",	"Hat Back",		"Hat Forward",	"Hat Left",		"Hat Right"
 };

-const char* Joy_hat_text_german[JOY_NUM_HAT_POS] = {
-	"Hut Hinten", "Hut Vorne", "Hut Links", "Hut Rechts"
+const char* Joy_button_text_german[] = {
+	"Knopf 1",		"Knopf 2",		"Knopf 3",		"Knopf 4",		"Knopf 5",		"Knopf 6",
+	"Knopf 7",		"Knopf 8",		"Knopf 9",		"Knopf 10",		"Knopf 11",		"Knopf 12",
+	"Knopf 13",		"Knopf 14",		"Knopf 15",		"Knopf 16",		"Knopf 17",		"Knopf 18",
+	"Knopf 19",		"Knopf 20",		"Knopf 21",		"Knopf 22",		"Knopf 23",		"Knopf 24",
+	"Knopf 25",		"Knopf 26",		"Knopf 27",		"Knopf 28",		"Knopf 29",		"Knopf 30",
+	"Knopf 31",		"Knopf 32",		"Hut Hinten",	"Hut Vorne",	"Hut Links",	"Hut Rechts"
 };

-const char* Joy_hat_text_french[JOY_NUM_HAT_POS] = {
-	"Chapeau Arri\x8Are", "Chapeau Avant", "Chapeau Gauche", "Chapeau Droite"
+const char* Joy_button_text_french[] = {
+	"Bouton 1",		"Bouton 2",		"Bouton 3",		"Bouton 4",		"Bouton 5",		"Bouton 6",
+	"Bouton 7",		"Bouton 8",		"Bouton 9",		"Bouton 10",		"Bouton 11",		"Bouton 12",
+	"Bouton 13",		"Bouton 14",		"Bouton 15",		"Bouton 16",		"Bouton 17",		"Bouton 18",
+	"Bouton 19",		"Bouton 20",		"Bouton 21",		"Bouton 22",		"Bouton 23",		"Bouton 24",
+	"Bouton 25",		"Bouton 26",		"Bouton 27",		"Bouton 28",		"Bouton 29",		"Bouton 30",
+	"Bouton 31",		"Bouton 32",		"Chapeau Arri\x8Are",		"Chapeau Avant",		"Chapeau Gauche",		"Chapeau Droite"
 };

-const char* Joy_hat_text_polish[JOY_NUM_HAT_POS] = {
-	"Hat Ty\xB3", "Hat Prz\xF3\x64", "Hat Lewo", "Hat Prawo"
-};
-
-const char* Joy_hat_text_english[JOY_NUM_HAT_POS] = {
-	"Hat Back", "Hat Forward", "Hat Left", "Hat Right"
+const char* Joy_button_text_polish[] = {
+	"Przyc.1",		"Przyc.2",		"Przyc.3",		"Przyc.4",		"Przyc.5",		"Przyc.6",
+	"Przyc.7",		"Przyc.8",		"Przyc.9",		"Przyc.10",	"Przyc.11",	"Przyc.12",
+	"Przyc.13",	"Przyc.14",	"Przyc.15",	"Przyc.16",	"Przyc.17",	"Przyc.18",
+	"Przyc.19",	"Przyc.20",	"Przyc.21",	"Przyc.22",	"Przyc.23",	"Przyc.24",
+	"Przyc.25",	"Przyc.26",	"Przyc.27",	"Przyc.28",	"Przyc.29",	"Przyc.30",
+	"Przyc.31",	"Przyc.32",	"Hat Ty\xB3",		"Hat Prz\xF3\x64",	"Hat Lewo",		"Hat Prawo"
 };

 //English scancodes are still needed eclusively for the scripting API, as we need to give generic and stable scan code names to the API that are neither translated nor localized to keyboard layout.
@@ -517,6 +540,17 @@ const char *Scan_code_text_english[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };

+const char* Joy_button_text_english[] = {
+	"Button 1",		"Button 2",		"Button 3",		"Button 4",		"Button 5",		"Button 6",
+	"Button 7",		"Button 8",		"Button 9",		"Button 10",	"Button 11",	"Button 12",
+	"Button 13",	"Button 14",	"Button 15",	"Button 16",	"Button 17",	"Button 18",
+	"Button 19",	"Button 20",	"Button 21",	"Button 22",	"Button 23",	"Button 24",
+	"Button 25",	"Button 26",	"Button 27",	"Button 28",	"Button 29",	"Button 30",
+	"Button 31",	"Button 32",	"Hat Back",		"Hat Forward",	"Hat Left",		"Hat Right"
+};
+
+const char **Joy_button_text = Joy_button_text_english;
+
 bool Generate_controlconfig_table = false;

 int sections_read = 0;	// Number of sections read within the controlconfigdefaults.tbl
@@ -609,9 +643,7 @@ const char *translate_key(char *key)

 	if (!first.empty() && !second.empty()) {
 		strcpy_s(text, first.textify().c_str());
-		strcat_s(text, " ");
-		strcat_s(text, XSTR("or", 1672));
-		strcat_s(text, " ");
+		strcat_s(text, " or ");
 		strcat_s(text, second.textify().c_str());

 	} else if (!first.empty()) {
@@ -621,7 +653,7 @@ const char *translate_key(char *key)
 		strcpy_s(text, second.textify().c_str());

 	} else {
-			strcpy_s(text, XSTR("None", 1673));
+			strcpy_s(text, "None");
 	}

 	return text;
@@ -632,7 +664,7 @@ const char *textify_scancode(int code)
 	static char text[BTN_MSG_LEN];

 	if (code < 0)
-		return XSTR("None", 1673);
+		return "None";

 	int keycode = code & KEY_MASK;

@@ -685,69 +717,7 @@ const char *textify_scancode_universal(int code)
 	
 	return text;
 }
-
-const char* textify_button(int btn) {
-	static char text[BTN_MSG_LEN];
-
-	if ((btn < 0) || (btn >= JOY_TOTAL_BUTTONS))
-		return "None";
-
-	text[0] = '\0';
-
-	if (btn < JOY_NUM_BUTTONS) {
-		// Is a button.
-		if (Lcl_gr) {
-			sprintf(text, "Knopf %i", btn);
-
-		} else if (Lcl_fr) {
-			sprintf(text, "Bouton %i", btn);
-
-		} else if (Lcl_pl) {
-			sprintf(text, "Przyc.%i", btn);
-
-		} else {
-			sprintf(text, "Button %i", btn);
-		}
-
-	} else {
-		//is Hat
-		btn -= JOY_NUM_BUTTONS;
-		Assertion(btn <= JOY_NUM_HAT_POS, "Invalid btn value '%i' after hat position translation.", btn);
-
-		if (Unicode_text_mode) {
-			// use unicode character maps
-			if (Lcl_gr) {
-				strcpy_s(text, Joy_hat_text_german_u[btn]);
-
-			} else if (Lcl_fr) {
-				strcpy_s(text, Joy_hat_text_french_u[btn]);
-
-			} else if (Lcl_pl) {
-				strcpy_s(text, Joy_hat_text_polish_u[btn]);
-
-			} else {
-				strcpy_s(text, Joy_hat_text_english_u[btn]);
-			}
-		} else {
-			// use ascii character maps
-			if (Lcl_gr) {
-				strcpy_s(text, Joy_hat_text_german[btn]);
-
-			} else if (Lcl_fr) {
-				strcpy_s(text, Joy_hat_text_french[btn]);
-
-			} else if (Lcl_pl) {
-				strcpy_s(text, Joy_hat_text_polish[btn]);
-
-			} else {
-				strcpy_s(text, Joy_hat_text_english[btn]);
-			}
-		}
-	}
-
-	return text;
-}
-	//XSTR:ON
+//XSTR:ON

 void control_config_common_load_overrides();

@@ -780,6 +750,36 @@ void control_config_common_init()
 	// load player presets
 	load_preset_files();

+	// Init control label localization
+	if (Unicode_text_mode) {
+		if (Lcl_gr) {
+			Joy_button_text = Joy_button_text_german_u;
+		}
+		else if (Lcl_fr) {
+			Joy_button_text = Joy_button_text_french_u;
+		}
+		else if (Lcl_pl) {
+			Joy_button_text = Joy_button_text_polish_u;
+		}
+		else {
+			Joy_button_text = Joy_button_text_english_u;
+		}
+	}
+	else {
+		if (Lcl_gr) {
+			Joy_button_text = Joy_button_text_german;
+		}
+		else if (Lcl_fr) {
+			Joy_button_text = Joy_button_text_french;
+		}
+		else if (Lcl_pl) {
+			Joy_button_text = Joy_button_text_polish;
+		}
+		else {
+			Joy_button_text = Joy_button_text_english;
+		}
+	}
+
 	// Old XSTR indices have been put beside their corresponding label in case we use them again
 	Axis_text[0] = vm_strdup(XSTR("X Axis", 1647));		// XSTR 1021 - "Joystick/Mouse X Axis"
 	Axis_text[1] = vm_strdup(XSTR("Y Axis", 1648));		// XSTR 1022 - "Joystick/Mouse Y Axis"
@@ -787,8 +787,6 @@ void control_config_common_init()
 	Axis_text[3] = vm_strdup(XSTR("rX Axis", 1650));	// XSTR 1024 - "Joystick rX Axis"
 	Axis_text[4] = vm_strdup(XSTR("rY Axis", 1651));	// XSTR 1025 - "Joystick rY Axis"
 	Axis_text[5] = vm_strdup(XSTR("rZ Axis", 1652));	// XSTR 1026 - "Joystick rZ Axis"
-	Axis_text[6] = vm_strdup(XSTR("U Axis", 1860));
-	Axis_text[7] = vm_strdup(XSTR("V Axis", 1861));

 	Mouse_button_text[0] = vm_strdup(XSTR("Left Button", 1027));
 	Mouse_button_text[1] = vm_strdup(XSTR("Right Button", 1028));
@@ -799,8 +797,6 @@ void control_config_common_init()
 	Mouse_button_text[6] = vm_strdup(XSTR("Wheel Down", 1656));
 	Mouse_button_text[7] = vm_strdup(XSTR("Wheel Left", 1657));
 	Mouse_button_text[8] = vm_strdup(XSTR("Wheel Right", 1658));
-
-	Script_system.OnStateDestroy.add([](lua_State*) -> void { Lua_hooks.clear(); });
 }

 /*
@@ -1150,7 +1146,6 @@ void LoadEnumsIntoActionMap() {
 	ADD_ENUM_TO_ACTION_MAP(TOGGLE_GLIDING)

 	ADD_ENUM_TO_ACTION_MAP(CYCLE_PRIMARY_WEAPON_SEQUENCE)
-	ADD_ENUM_TO_ACTION_MAP(CYCLE_PRIMARY_WEAPON_PATTERN)

 	ADD_ENUM_TO_ACTION_MAP(CUSTOM_CONTROL_1)
 	ADD_ENUM_TO_ACTION_MAP(CUSTOM_CONTROL_2)
@@ -1203,8 +1198,6 @@ void LoadEnumsIntoAxisMap() {
 	mAxisNameToVal["RX_AXIS"] = JOY_RX_AXIS;
 	mAxisNameToVal["RY_AXIS"] = JOY_RY_AXIS;
 	mAxisNameToVal["RZ_AXIS"] = JOY_RZ_AXIS;
-	mAxisNameToVal["U_AXIS"] = JOY_U_AXIS;
-	mAxisNameToVal["V_AXIS"] = JOY_V_AXIS;
 }

 void LoadEnumsIntoHatMap() {
@@ -1956,7 +1949,7 @@ int control_config_common_write_tbl(bool overwrite = false, bool all = false) {
 		return 1;
 	}

-	CFILE* cfile = cfopen("controlconfigdefaults.tbl", "w", CF_TYPE_TABLES);
+	CFILE* cfile = cfopen("controlconfigdefaults.tbl", "w", CFILE_NORMAL, CF_TYPE_TABLES);
 	if (cfile == nullptr) {
 		// Could not open. Bail.
 		return 1;
@@ -2649,21 +2642,22 @@ SCP_string CC_bind::textify() const {
 	SCP_string prefix;
 	SCP_string retval;

+	// TODO: XSTR the Mouse/Joy prefix
 	switch (cid) {
 	case CID_MOUSE:
-		prefix = XSTR("Mouse ", 1868);
+		prefix = "Mouse ";
 		break;
 	case CID_JOY0:
-		prefix = XSTR("Joy-0 ", 1869);
+		prefix = "Joy-0 ";
 		break;
 	case CID_JOY1:
-		prefix = XSTR("Joy-1 ", 1870);
+		prefix = "Joy-1 ";
 		break;
 	case CID_JOY2:
-		prefix = XSTR("Joy-2 ", 1871);
+		prefix = "Joy-2 ";
 		break;
 	case CID_JOY3:
-		prefix = XSTR("Joy-3 ", 1872);
+		prefix = "Joy-3 ";
 		break;
 	case CID_NONE:
 	case CID_KEYBOARD:
@@ -2675,7 +2669,7 @@ SCP_string CC_bind::textify() const {
 	if (flags & CCF_AXIS) {
 		// Is Axis
 		if (cid == CID_NONE) {
-			retval = XSTR("None", 1873);
+			retval = "None";
 		} else {
 			Assert((btn >= 0) && (btn < NUM_AXIS_TEXT));
 			retval = SCP_string(Axis_text[btn]);
@@ -2698,12 +2692,12 @@ SCP_string CC_bind::textify() const {
 		case CID_JOY2:
 		case CID_JOY3:
 			Assert((btn >= 0) && (btn < JOY_TOTAL_BUTTONS));
-			retval = SCP_string(textify_button(btn));
+			retval = SCP_string(Joy_button_text[btn]);
 			break;

 		case CID_NONE:
 		default:
-			retval = XSTR("None", 1873);
+			retval = "None";
 		break;
 		}
 	}
@@ -2782,12 +2776,10 @@ bool CCB::operator!=(const CCB& A) const {
 }

 bool CCB::has_first_conflict(const CCB& A) const {
-	// coverity[copy_paste_error:FALSE]
 	return !first.empty() && (first.conflicts_with(A.first) || first.conflicts_with(A.second));
 }

 bool CCB::has_second_conflict(const CCB& A) const {
-	// coverity[copy_paste_error:FALSE]
 	return !second.empty() && (second.conflicts_with(A.first) || second.conflicts_with(A.second));
 }

@@ -1,9 +1,7 @@
 #include "controlconfig/controlsconfig.h"
 #include "controlconfig/presets.h"
-#include "gamesequence/gamesequence.h"
 #include "libs/jansson.h"
 #include "parse/parselo.h"
-#include "popup/popup.h"

 #include <jansson.h>

@@ -37,7 +35,7 @@ Section lookupSectionValue(const char* name) {
 	return Section::Invalid;
 }

-void load_preset_files(SCP_string clone) {
+void load_preset_files() {
 	SCP_vector<SCP_string> filelist;
 	cf_get_file_list(filelist, CF_TYPE_PLAYER_BINDS, NOX("*.json"), CF_SORT_NAME, nullptr,
 	                 CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
@@ -45,7 +43,7 @@ void load_preset_files(SCP_string clone) {
 	std::unique_ptr<PresetFileHandler> handler = nullptr;

 	for (const auto &file : filelist) {
-		CFILE* fp = cfopen((file + ".json").c_str(), "r", CF_TYPE_PLAYER_BINDS, false,
+		CFILE* fp = cfopen((file + ".json").c_str(), "r", CFILE_NORMAL, CF_TYPE_PLAYER_BINDS, false,
 						   CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);

 		if (!fp) {
@@ -130,17 +128,12 @@ void load_preset_files(SCP_string clone) {
 		// Done with the file
 		auto it = preset_find_duplicate(preset);

-		// If we just cloned the file, then allow the duplicate. Just this once.
-		if ((clone == preset.name) || (it == Control_config_presets.end())) {
+		if (it == Control_config_presets.end()) {
 			Control_config_presets.push_back(preset);

 		} else if ((it->name != preset.name) || (it->type != Preset_t::pst)) {
-			if (gameseq_get_state() == GS_STATE_CONTROL_CONFIG) {
-				popup(PF_TITLE_WHITE | PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, "Preset '%s' is a duplicate of an existing preset, ignoring", preset.name.c_str());
-			} else {
-				// Complain and ignore if the preset names or the type differs
-				Warning(LOCATION, "PST => Preset '%s' is a duplicate of an existing preset, ignoring", preset.name.c_str());
-			}
+			// Complain and ignore if the preset names or the type differs
+			Warning(LOCATION, "PST => Preset '%s' is a duplicate of an existing preset, ignoring", preset.name.c_str());
 		
 		} // else, silent ignore
 	}
@@ -154,31 +147,6 @@ bool preset_file_exists(SCP_string name) {
 	return cf_exists(name.c_str(), CF_TYPE_PLAYER_BINDS) != 0;
 }

-bool delete_preset_file(CC_preset preset) {
-
-	// can't remove the default preset!
-	if (preset.name == "default") {
-		return false;
-	}
-
-	auto it = control_config_get_current_preset();
-
-	// can't remove the currently loaded preset either!
-	if (preset.name == it->name) {
-		return false;
-	}
-
-	SCP_string filename = preset.name + ".json";
-
-	cf_delete(filename.c_str(), CF_TYPE_PLAYER_BINDS, CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
-
-	// Reload the presets from file.
-	Control_config_presets.resize(1);
-	load_preset_files();
-
-	return true;
-}
-
 bool save_preset_file(CC_preset preset, bool overwrite) {
 	// Must have a name
 	if (preset.name.empty()) {
@@ -190,7 +158,7 @@ bool save_preset_file(CC_preset preset, bool overwrite) {
 	std::unique_ptr<PresetFileHandler> handler = nullptr;

 	// Check if there's a file already
-	CFILE* fp = cfopen(filename.c_str(), "r", CF_TYPE_PLAYER_BINDS, false,
+	CFILE* fp = cfopen(filename.c_str(), "r", CFILE_NORMAL, CF_TYPE_PLAYER_BINDS, false,
 	                  CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
 	
 	if ((fp != nullptr) && !overwrite) {
@@ -199,7 +167,7 @@ bool save_preset_file(CC_preset preset, bool overwrite) {
 	}

 	// Try opening file for write
-	fp = cfopen(filename.c_str(), "w", CF_TYPE_PLAYER_BINDS, false,
+	fp = cfopen(filename.c_str(), "w", CFILE_NORMAL, CF_TYPE_PLAYER_BINDS, false,
 					   CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);

 	if (!fp) {
@@ -209,24 +209,12 @@ private:
 */
 bool save_preset_file(CC_preset preset, bool overwrite);

-/**
- * @brief Deletes the given preset to file.
- * @param[in] preset    The preset to delete
- *
- * @returns True    if successful, or
- * @returns False   Preset is default, or
- * @returns False   Preset file is the currently selected preset
- */
-bool delete_preset_file(CC_preset preset);
-
 /**
 * @brief Loads in all preset .json files from 'players/presets'
 * @details If a preset file is unique, it is loaded into the game and available for use by the player.  However, if
 * a preset is a duplicate of another preset, it is ignored, and the player is warned of it
- * 
- * @param[in] clone Used to check if we just cloned a particular preset and allows just that clone in without warning
 */
-void load_preset_files(SCP_string clone = "");
+void load_preset_files();

 /**
 * @brief Checks if the given preset is a duplicate within Control_config_presets vector
@@ -52,7 +52,6 @@ struct MovieProperties {
 	FrameSize size;

 	float fps = -1.0f;
-	float duration = 0.0f;

 	FramePixelFormat pixelFormat = FramePixelFormat::Invalid;
 };
@@ -109,7 +108,7 @@ class Decoder {
 	 * @note A implementation should initialize the datastructures required for decoding here.
 	 *
 	 * @param fileName The name of the file that should be opened
-	 * @return @c true if the initialization was successful, @c false otherwise
+	 * @return @c true if the initialization was successfull, @c false otherwise
 	 */
 	virtual bool initialize(const SCP_string& fileName, const PlaybackProperties& properties) = 0;

@@ -25,8 +25,6 @@

 extern int Cmdline_nomovies;

-bool Movie_active = false;
-

 const char* Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
 		"ViewFootage",
@@ -62,18 +60,6 @@ static cutscene_info *get_cutscene_pointer(char *cutscene_filename)
 	return NULL;
 }

-int get_cutscene_index_by_name(const char* name)
-{
-	for (int i = 0; i < static_cast<int>(Cutscenes.size()); i++) {
-		if (!stricmp(name, Cutscenes[i].name)) {
-			return i;
-		}
-	}
-
-	// Didn't find anything.
-	return -1;
-}
-
 static void cutscene_info_init(cutscene_info *csni)
 {
 	csni->filename[0] = '\0';
@@ -189,9 +175,6 @@ void parse_cutscene_table(const char* filename)
 				if (flag)
 					csnp->flags.set(Cutscene::Cutscene_Flags::Never_viewable);
 			}
-			if (optional_string("$Custom data:")) {
-				parse_string_map(csnp->custom_data, "$end_custom_data", "+Val:");
-			}

 		}

@@ -236,6 +219,7 @@ void cutscene_mark_viewable(const char* filename)

 	// change to lower case
 	strlwr(file);
+	int i = 0;
 	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut)
 	{
 		// change the cutscene file name to lower case
@@ -248,6 +232,7 @@ void cutscene_mark_viewable(const char* filename)
 			cut->flags.set(Cutscene::Cutscene_Flags::Viewable);
 			return;
 		}
+		i++;
 	}

 	Warning(LOCATION, "Could not find cutscene '%s' in listing; cannot mark it viewable...", filename);
@@ -354,25 +339,32 @@ static const char* Text_lines[MAX_TEXT_LINES];

 void cutscenes_screen_play()
 {
-	Assertion(SCP_vector_inbounds(Cutscene_list, Selected_line), "Selected line %d is out of range!", Selected_line);
-	int which_cutscene = Cutscene_list[Selected_line];
+	char name[MAX_FILENAME_LEN]; // *full_name 
+	int which_cutscene;
+
+	Assert((Selected_line >= 0) && (Selected_line < (int) Cutscene_list.size()));
+	which_cutscene = Cutscene_list[Selected_line];
+
+	strcpy_s(name, Cutscenes[which_cutscene].filename);
+//	full_name = cf_add_ext(name, NOX(".mve"));

 	main_hall_stop_music(true);
 	main_hall_stop_ambient();
-	auto rval = movie::play(Cutscenes[which_cutscene].filename, true);
+	auto rval = movie::play(name);
 	main_hall_start_music();

 	if (!rval)
 	{
-		SCP_string str;
+		char str[256];

 		if (Cmdline_nomovies)
-			str = XSTR("Movies are currently disabled.", 1574);
+			strcpy_s(str, XSTR("Movies are currently disabled.", 1574));
 		else
 			sprintf(str, XSTR("Unable to play movie %s.", 204), Cutscenes[which_cutscene].name);

-		popup(PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, str.c_str());
+		popup(PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, str);
 	}
+
 }

 void cutscenes_screen_scroll_line_up()
@@ -32,13 +32,10 @@ typedef struct cutscene_info
 	char name[NAME_LENGTH];
 	char* description;
 	flagset<Cutscene::Cutscene_Flags> flags;
-	SCP_map<SCP_string, SCP_string> custom_data;
 } cutscene_info;

 extern SCP_vector<cutscene_info> Cutscenes;

-extern bool Movie_active;
-
 // initializa table data
 void cutscene_init();

@@ -50,6 +47,4 @@ void cutscenes_screen_do_frame();

 void cutscene_mark_viewable(const char* filename);

-int get_cutscene_index_by_name(const char* name);
-
 #endif
@@ -6,7 +6,7 @@ namespace {
 const int OUT_CH_LAYOUT = AV_CH_LAYOUT_STEREO;
 const int OUT_SAMPLE_RATE = 48000;
 const AVSampleFormat OUT_SAMPLE_FORMAT = AV_SAMPLE_FMT_S16;
-const int OUT_NUM_CHANNELS = av_popcount64(OUT_CH_LAYOUT);
+const int OUT_NUM_CHANNELS = av_get_channel_layout_nb_channels(OUT_CH_LAYOUT);

 const int DEFAULT_SRC_NUM_SAMPLES = 1024;