Merge branch 'DescentDevelopers:main' into objunlink-sanity-check

.github/ISSUE_TEMPLATE/01-build-failure.md

@@ -0,0 +1,53 @@
+---
+name: Build Failure
+about: Report a failure to build current code in any supported configuration.
+labels: 'build-failure'
+title: '[Build Failure] '
+
+---
+<!--
+Use this template if the code in main fails to build for you.  If your problem happens at runtime, please use the issue template `Runtime Crash` or the issue template `Runtime Bug`, as appropriate.
+
+Please use a descriptive title. Include in the title the _first_ error message. Attach your buildlog if possible.
+-->
+
+### Build Version
+<!--
+If you fetched the source from Git, state the Git commit you used, preferably as the full 40-digit commit hash.  Please do **not** say "HEAD", "current", or similar relative references.  
+The meaning of relative references can change as contributors publish new code.  The 40-digit commit hash will not change.
+-->
+
+#### Operating System Environment
+<!--
+State what host platform (Microsoft Windows, Mac OS X, or Linux) you tried.  If you tried multiple, list all of them.
+-->
+* [ ] Microsoft Windows (32-bit)
+* [ ] Microsoft Windows (64-bit)
+* [ ] Mac OS X
+* [ ] Linux: <specify distribution and version>
+
+#### CPU Environment
+<!--
+Indicate which CPU families were targeted.  Some bugs are only visible on certain architectures, since other architectures hide the consequences of the mistake.
+If unsure, omit this section.  Generally, if you are on an architecture that requires special consideration, you will know your architecture.
+-->
+* [ ] x86 (32-bit Intel/AMD)
+* [ ] x86\_64 (64-bit Intel/AMD)
+* [ ] ARM (32-bit)
+* [ ] ARM64 (64-bit; sometimes called AArch64)
+* [ ] Other (RISC V, PPC...)
+
+### Description
+<!--
+Describe the issue here.
+-->
+
+#### Regression Status
+<!--
+What is the oldest Git commit known to present the problem?  What is the newest Git commit known not to present the problem?
+-->
+
+### Steps to Reproduce
+<!--
+If you performed build steps outside of the build steps listed in the README.md file, please list them here.
+-->

.github/ISSUE_TEMPLATE/02-runtime-issue.md

@@ -0,0 +1,86 @@
+---
+name: Runtime Bug/Crash
+about: Report a bug or crash at runtime in any supported configuration.
+labels: 'bug'
+title: '[Runtime Bug/Crash] '
+
+---
+<!--
+Use this template if a current build has a bug or crashes at runtime.  If your problem happens at build time, please use the issue template `Failure to build`.
+-->
+
+### Build Version
+<!--
+If you fetched the source from Git, state the Git commit you used, preferably as the full 40-digit commit hash.  Please do **not** say "HEAD", "current", or similar relative references.  
+The meaning of relative references can change as contributors publish new code.  The 40-digit commit hash will not change.
+-->
+
+#### Operating System Environment
+<!--
+State what host platform (Microsoft Windows, Mac OS X, or Linux) you tried.  If you tried multiple, list all of them.
+-->
+* [ ] Microsoft Windows (32-bit)
+* [ ] Microsoft Windows (64-bit)
+* [ ] Mac OS X
+* [ ] Linux: <specify distribution and version>
+
+#### CPU Environment
+<!--
+Indicate which CPU families were targeted.  Some bugs are only visible on certain architectures, since other architectures hide the consequences of the mistake.
+If unsure, omit this section.  Generally, if you are on an architecture that requires special consideration, you will know your architecture.
+-->
+* [ ] x86 (32-bit Intel/AMD)
+* [ ] x86\_64 (64-bit Intel/AMD)
+* [ ] ARM (32-bit)
+* [ ] ARM64 (64-bit; sometimes called AArch64)
+* [ ] Other (RISC V, PPC...)
+
+#### Game Environment
+<!--
+If the issue is specific to a particular mission, give the name of the campaign and the level of the mission within that campaign. 
+If the campaign is not one of the core assets (`Descent 3: Retribution`, `Descent 3: Mercenary`, or any of the other missions provided with the GOG and Steam release), give a download link to the campaign.
+
+If the issue occurs at some particular place in the level, give a description how to reach that point from the beginning of the level. Assume that the maintainer  is not familiar with the optimal route to get from the start point to the affected location.
+-->
+
+### Description
+<!--
+Describe the issue here.
+-->
+
+#### Regression Status
+<!--
+What is the oldest Git commit known to present the problem?  What is the newest Git commit known not to present the problem?
+-->
+
+### Steps to Reproduce
+<!--
+Provide:
+- Expected behavior
+- Observed behavior
+- If possible, describe the frequency of the problem.  Does it happen every time the steps to reproduce are followed?  If it is intermittent, are there any events correlated with the error?
+- If the game produced any error messages, include their text verbatim.  If you paraphrase the message, you will likely be asked to reproduce the error and collect a verbatim copy of the text.
+- For in-game problems, indicate whether it happens in single player, multiplayer cooperative, or multiplayer competitive. You do not need to check every combination before filing, but please report which combinations you checked and the results you found for those combinations.
+- If the game crashed and a crash dump was created, include the dump backtrace.
+-->
+
+* Game modes affected:
+  * [ ] Single player
+  * [ ] Multiplayer competitive
+    * [ ] Anarchy
+	* [ ] Hyper-Anarchy
+	* [ ] Robo-Anarchy
+    * [ ] Team Anarchy
+    * [ ] Capture the Flag
+    * [ ] Bounty
+	* [ ] Entropy
+	* [ ] Hoard
+	* [ ] Monsterball
+  * [ ] Multiplayer cooperative
+
+<!--
+If the issue is only observed in single player, delete this next group.
+-->
+* Players affected by issue:
+  * [ ] Game host
+  * [ ] Game guests

.github/workflows/build.yml

@@ -16,7 +16,6 @@ jobs:
           - {runner: macos-12, preset: mac}       # This is supposed to be Intel for now, and what macos-latest is defaulting to for some reason (as of 04/2024)
           - {runner: macos-14, preset: mac}       # This is supposed to be M1
           - {runner: ubuntu-latest, preset: linux}
-        build_type: [Debug, Release]
 
     runs-on: ${{ matrix.os.runner }}
 
@@ -32,21 +31,23 @@ jobs:
       - name: Install Linux dependencies
         if: ${{ matrix.os.preset == 'linux' }}
         run: |
-          sudo dpkg --add-architecture i386
           sudo apt update
           sudo apt install -y --no-install-recommends \
-            ninja-build make cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev \
-            libxext6:i386  # for ./scripts/hogutils/hogUtils-i686 binary
-          mkdir ~/Descent3
+            ninja-build cmake g++ libsdl1.2-dev libsdl-image1.2-dev libncurses-dev
 
       - name: Configure CMake
         run: cmake --preset ${{ matrix.os.preset }}
 
-      - name: Build
-        run: cmake --build --preset ${{ matrix.os.preset }} --config ${{ matrix.build_type }}
+      - name: Debug Build
+        run: cmake --build --preset ${{ matrix.os.preset }} --config Debug --verbose
+
+      - name: Release Build
+        run: cmake --build --preset ${{ matrix.os.preset }} --config Release --verbose
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build_${{ matrix.os.runner }}_${{ matrix.build_type }}
-          path: "${{ github.workspace }}/builds/${{ matrix.os.preset }}/Descent3/${{ matrix.build_type }}"
+          name: build_${{ matrix.os.runner }}
+          path: |
+            ${{ github.workspace }}/builds/${{ matrix.os.preset }}/Descent3/Debug/
+            ${{ github.workspace }}/builds/${{ matrix.os.preset }}/Descent3/Release/

.gitignore

@@ -28,6 +28,7 @@ x86/
 #[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
+[Bb]uilds/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
@@ -404,8 +405,4 @@ cmake-build-*
 
 # Linux stuff
 build
-*.so
-
-
-# D3 specific
-*.hog
+builds

2dlib/CMakeLists.txt

@@ -1,13 +1,13 @@
 set(HEADERS lib2d.h)
 set(CPPS
-	font.cpp
-	hardsurf.cpp
-	memsurf.cpp
-	pen.cpp
-	pentext.cpp
-	screen.cpp
-	surface.cpp
-	viewport.cpp)
+  font.cpp
+  hardsurf.cpp
+  memsurf.cpp
+  pen.cpp
+  pentext.cpp
+  screen.cpp
+  surface.cpp
+  viewport.cpp)
 
 add_library(2dlib STATIC ${HEADERS} ${CPPS})
-    
+

AudioEncode/CMakeLists.txt

@@ -1,6 +1,6 @@
-set(HEADERS )
-set(CPPS
-		encoder.cpp)
-
-add_library(AudioEncode STATIC ${HEADERS} ${CPPS})
-target_link_libraries(AudioEncode libacm)
+set(HEADERS)
+set(CPPS
+  encoder.cpp)
+
+add_library(AudioEncode STATIC ${HEADERS} ${CPPS})
+target_link_libraries(AudioEncode libacm)

Brewfile

@@ -8,4 +8,5 @@ cask "xquartz"
 brew "sdl12-compat"
 brew "sdl2_image"
 
+brew "cmake"
 brew "ninja"