Merge branch 'main' into refactor/mod-information-file-export

R2Northstar · Mar 2, 2025 · 1b24f48 · 1b24f48
2 parents 05b7d8d + c7e2d7e
commit 1b24f48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,15 +32,15 @@ jobs:
       - name: Build
         run: cmake --build build/
       - name: Upload launcher build as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: northstar-launcher
           path: |
             build/game/*.exe
             build/game/*.dll
             build/game/bin/x64_retail/*.dll
       - name: Upload debug build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: launcher-debug-files
           path: |
@@ -53,12 +53,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Download compiled launcher
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: northstar-launcher
           path: northstar-launcher
       - name: Download compiled launcher
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: launcher-debug-files
           path: launcher-debug-files

diff --git a/primedev/shared/misccommands.cpp b/primedev/shared/misccommands.cpp
@@ -301,6 +301,7 @@ void FixupCvarFlags()
 		// these 2 could be FCVAR_CHEAT, i guess?
 		{"cl_draw_player_model", FCVAR_DEVELOPMENTONLY},
 		{"cl_always_draw_3p_player", FCVAR_DEVELOPMENTONLY},
+		{"cl_gib_lifetime", FCVAR_CHEAT},
 		{"idcolor_neutral", FCVAR_DEVELOPMENTONLY},
 		{"idcolor_ally", FCVAR_DEVELOPMENTONLY},
 		{"idcolor_ally_cb1", FCVAR_DEVELOPMENTONLY},