Merge branch 'master' into gradual-ammo-cookoff

.github/workflows/arma.yml

@@ -43,3 +43,4 @@ jobs:
       with:
         name: ace3-${{ github.sha }}-nobin
         path: .hemttout/@*
+        include-hidden-files: true # Because .hemttout is a hidden directory

.github/workflows/extensions.yml

@@ -57,7 +57,7 @@ jobs:
     - name: Build
       run: cargo build --verbose
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.arrays.os.target }}
         path: target/debug/ace.dll

.github/workflows/hemtt.yml

@@ -44,3 +44,4 @@ jobs:
       with:
         name: ace3-${{ github.sha }}
         path: .hemttout/@*
+        include-hidden-files: true # Because .hemttout is a hidden directory

.github/workflows/pboproject.yml

@@ -1,85 +1,85 @@
-name: pboProject
+# name: pboProject
 
-on:
-  push:
-    branches:
-    - master
-  pull_request_target:
+# on:
+#   push:
+#     branches:
+#     - master
+#   pull_request_target:
 
-jobs:
-  pboproject:
-    runs-on: windows-2022
-    steps:
-    - name: Install Arma 3 Tools
-      uses: arma-actions/arma3-tools@master
-      with:
-        toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
-    - name: Install Mikero Tools
-      uses: arma-actions/mikero-tools@2023-01-04
-    - name: Download game data
-      run: |
-        Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip
-        Invoke-WebRequest "$env:RHSAFRF_URL" -OutFile rhsafrf.zip
-        Invoke-WebRequest "$env:RHSGREF_URL" -OutFile rhsgref.zip
-        Invoke-WebRequest "$env:RHSSAF_URL" -OutFile rhssaf.zip
-        Invoke-WebRequest "$env:RHSUSF_URL" -OutFile rhsusf.zip
-        $files = @("arma3.zip", "rhsafrf.zip", "rhsgref.zip", "rhssaf.zip", "rhsusf.zip")
-        ForEach ($file in $files) {
-          Expand-7ZipArchive -Path $file -DestinationPath .
-          Remove-Item $file
-        }
-      env:
-        ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }}
-        RHSAFRF_URL: ${{ secrets.RHSAFRF_URL }}
-        RHSGREF_URL: ${{ secrets.RHSGREF_URL }}
-        RHSSAF_URL: ${{ secrets.RHSSAF_URL }}
-        RHSUSF_URL: ${{ secrets.RHSUSF_URL }}
-    - name: Checkout CBA A3
-      uses: actions/checkout@v4
-      with:
-        path: x\cba
-        ref: master
-        repository: CBATeam/CBA_A3.git
-    - name: Checkout ACE3
-      uses: actions/checkout@v4
-      with:
-        path: z\ace
-        persist-credentials: false
-    - name: Checkout pull request
-      uses: actions/checkout@v4
-      if: ${{ github.event_name == 'pull_request_target' }}
-      with:
-        path: pullrequest
-        ref: 'refs/pull/${{ github.event.number }}/merge'
-    - name: Replace addons with pull request addons
-      if: ${{ github.event_name == 'pull_request_target' }}
-      run: |
-        rm -r z\ace\addons\
-        rm -r z\ace\optionals\
-        rm -r z\ace\tools\pDummies\
-        xcopy /e /h /q pullrequest\addons z\ace\addons\
-        xcopy /e /h /q pullrequest\optionals z\ace\optionals\
-        xcopy /e /h /q pullrequest\tools\pDummies z\ace\tools\pDummies\
-    - name: Setup build environment
-      run: |
-        subst P: .
-        pboproject -P
-        xcopy /e /h /q z\ace\tools\pDummies\gm gm\
-        xcopy /e /h /q z\ace\tools\pDummies\vn vn\
-        xcopy /e /h /q z\ace\tools\pDummies\WW2 WW2\
-        xcopy /e /h /q z\ace\tools\pDummies\CUP CUP\
-    - name: Build
-      run: py P:\z\ace\tools\make.py ci
-      env:
-        PYTHONUNBUFFERED: 1
-    - name: Archive logs
-      uses: actions/upload-artifact@v4
-      if: ${{ always() }}
-      with:
-        name: logs
-        path: temp/*.log
-    - name: Archive @ace
-      uses: actions/upload-artifact@v4
-      with:
-        name: '@ace3-${{ github.sha }}'
-        path: z\ace\release\@ace
+# jobs:
+  # pboproject:
+  #   runs-on: windows-2022
+  #   steps:
+  #   - name: Install Arma 3 Tools
+  #     uses: arma-actions/arma3-tools@master
+  #     with:
+  #       toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
+  #   - name: Install Mikero Tools
+  #     uses: arma-actions/mikero-tools@2024-10-08
+  #   - name: Download game data
+  #     run: |
+  #       Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip
+  #       Invoke-WebRequest "$env:RHSAFRF_URL" -OutFile rhsafrf.zip
+  #       Invoke-WebRequest "$env:RHSGREF_URL" -OutFile rhsgref.zip
+  #       Invoke-WebRequest "$env:RHSSAF_URL" -OutFile rhssaf.zip
+  #       Invoke-WebRequest "$env:RHSUSF_URL" -OutFile rhsusf.zip
+  #       $files = @("arma3.zip", "rhsafrf.zip", "rhsgref.zip", "rhssaf.zip", "rhsusf.zip")
+  #       ForEach ($file in $files) {
+  #         Expand-7ZipArchive -Path $file -DestinationPath .
+  #         Remove-Item $file
+  #       }
+  #     env:
+  #       ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }}
+  #       RHSAFRF_URL: ${{ secrets.RHSAFRF_URL }}
+  #       RHSGREF_URL: ${{ secrets.RHSGREF_URL }}
+  #       RHSSAF_URL: ${{ secrets.RHSSAF_URL }}
+  #       RHSUSF_URL: ${{ secrets.RHSUSF_URL }}
+  #   - name: Checkout CBA A3
+  #     uses: actions/checkout@v4
+  #     with:
+  #       path: x\cba
+  #       ref: master
+  #       repository: CBATeam/CBA_A3.git
+  #   - name: Checkout ACE3
+  #     uses: actions/checkout@v4
+  #     with:
+  #       path: z\ace
+  #       persist-credentials: false
+  #   - name: Checkout pull request
+  #     uses: actions/checkout@v4
+  #     if: ${{ github.event_name == 'pull_request_target' }}
+  #     with:
+  #       path: pullrequest
+  #       ref: 'refs/pull/${{ github.event.number }}/merge'
+  #   - name: Replace addons with pull request addons
+  #     if: ${{ github.event_name == 'pull_request_target' }}
+  #     run: |
+  #       rm -r z\ace\addons\
+  #       rm -r z\ace\optionals\
+  #       rm -r z\ace\tools\pDummies\
+  #       xcopy /e /h /q pullrequest\addons z\ace\addons\
+  #       xcopy /e /h /q pullrequest\optionals z\ace\optionals\
+  #       xcopy /e /h /q pullrequest\tools\pDummies z\ace\tools\pDummies\
+  #   - name: Setup build environment
+  #     run: |
+  #       subst P: .
+  #       pboproject -P
+  #       xcopy /e /h /q z\ace\tools\pDummies\gm gm\
+  #       xcopy /e /h /q z\ace\tools\pDummies\vn vn\
+  #       xcopy /e /h /q z\ace\tools\pDummies\WW2 WW2\
+  #       xcopy /e /h /q z\ace\tools\pDummies\CUP CUP\
+  #   - name: Build
+  #     run: py P:\z\ace\tools\make.py ci
+  #     env:
+  #       PYTHONUNBUFFERED: 1
+  #   - name: Archive logs
+  #     uses: actions/upload-artifact@v4
+  #     if: ${{ always() }}
+  #     with:
+  #       name: logs
+  #       path: temp/*.log
+  #   - name: Archive @ace
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: '@ace3-${{ github.sha }}'
+  #       path: z\ace\release\@ace

.hemtt/launch.toml

@@ -0,0 +1,31 @@
+[default]
+workshop = [
+    "450814997", # CBA_A3
+]
+
+[spe]
+extends = "default"
+dlc = [
+    "Spearhead 1944"
+]
+
+[vn]
+extends = "default"
+dlc = [
+    "S.O.G. Prairie Fire",
+]
+
+[ws]
+extends = "default"
+dlc = [
+    "Western Sahara",
+]
+
+[rhs]
+extends = "default"
+workshop = [
+    "843425103", # RHS AFRF Workshop ID
+    "843577117", # RHS USAF Workshop ID
+    "843593391", # RHS GREF Workshop ID
+    "843632231", # RHS SAF  Workshop ID
+]

.hemtt/lints.toml

@@ -0,0 +1,10 @@
+[sqf.banned_commands]
+options.ignore = [
+    "addPublicVariableEventHandler", # Alt syntax is broken, we are using main syntax
+    "createSoundSource", # Greatly attenuated when in first person and in a vehicle
+]
+
+[sqf.var_all_caps]
+options.ignore = [
+    "SLX_*", "ACE_*"
+]

.hemtt/project.toml

@@ -27,35 +27,3 @@ exclude = [
     "common/functions/fnc_dummy.sqf",
     "zeus/functions/fnc_zeusAttributes.sqf",
 ]
-
-[hemtt.launch.default]
-workshop = [
-    "450814997", # CBA_A3
-]
-
-[hemtt.launch.spe]
-extends = "default"
-dlc = [
-    "spe"
-]
-
-[hemtt.launch.vn]
-extends = "default"
-dlc = [
-    "S.O.G. Prairie Fire",
-]
-
-[hemtt.launch.ws]
-extends = "default"
-dlc = [
-    "Western Sahara",
-]
-
-[hemtt.launch.rhs]
-extends = "default"
-workshop = [
-    "843425103", # RHS AFRF Workshop ID
-    "843577117", # RHS USAF Workshop ID
-    "843593391", # RHS GREF Workshop ID
-    "843632231", # RHS SAF  Workshop ID
-]

AUTHORS.txt

@@ -42,6 +42,7 @@ Walter Pearce <[email protected]>
 11RDP-LoupVert <[email protected]>
 654wak654 <[email protected]>
 [BIG]Bull
+Abogado "regiregi22"
 ACCtomeek
 adam3adam <[email protected]>
 Adanteh
@@ -177,6 +178,7 @@ SzwedzikPL <[email protected]>
 Tachi <[email protected]>
 tbeswick96
 Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
+ThomasAngel
 Timi007 <[email protected]>
 Toaster <[email protected]>
 Tonic