Merge branch 'master' into getShotInfo

.editorconfig

@@ -11,5 +11,8 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
+[*.yml]
+indent_size = 2
+
 [Makefile]
 indent_style = tab

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,14 +23,14 @@ All good? Then proceed and fill out the items below.
 **Mods (complete and add to the following information):**
 - **Arma 3:** `x.xx` [e.g. 1.00 stable, rc,  dev]
 - **CBA:** `3.x.x` [e.g. 3.0.0 stable, commit hash]
-- **ACE3:** `3.x.x` [eg. 3.0.0 stable, commit hash]
+- **ACE3:** `3.x.x` [e.g. 3.0.0 stable, commit hash]
 <!-- Make sure to reproduce the issue with only CBA and ACE3 on a newly created mission! -->
 
 **Description:**
 A clear and concise description of what the bug is.
 
 **Steps to reproduce:**
-_Follow [https://ace3.acemod.org/img/wiki/user/issue_flowchart.webp](this flowchart)!_
+_Follow [this flowchart](https://ace3.acemod.org/img/wiki/user/issue_flowchart.webp)!_
 
 1. _Go to ..._
 2. _Click ..._

.github/release-drafter.yml

@@ -11,29 +11,27 @@ sort-direction: ascending
 categories:
   - title: '**ADDED:**'
     labels:
-      - 'kind/feature request'
-      - 'kind/added feature'
+      - 'kind/feature'
   - title: '**FIXED:**'
     labels:
-      - 'kind/bug fix'
+      - 'kind/bug-fix'
   - title: '**IMPROVED:**'
     labels:
       - 'kind/enhancement'
       - 'kind/optimization'
   - title: '**CHANGED:**'
     labels:
       - 'kind/cleanup'
-      - 'area/compatibility'
       - 'kind/change'
   - title: '**SETTINGS:**'
     labels:
       - 'kind/setting'
   - title: '**TRANSLATIONS:**'
     labels:
-      - 'area/translations'
+      - 'kind/translation'
 
 exclude-labels:
-  - 'ignore changelog'
+  - 'ignore-changelog'
   - 'dependencies'
 
 change-template: '- $TITLE (#$NUMBER)'

.github/workflows/arma.yml

@@ -27,15 +27,6 @@ jobs:
     - name: Validate function headers
       run: python3 docs/tools/document_functions.py --debug
 
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the source code
-      uses: actions/checkout@v4
-    - name: Lint (sqflint)
-      uses: arma-actions/sqflint@master
-      continue-on-error: true # No failure due to many false-positives
-
   build:
     runs-on: ubuntu-latest
     steps:
@@ -52,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

@@ -1,29 +1,65 @@
 name: Extensions
 
 on:
-  pull_request:
+  push:
     paths:
-    - 'extensions/**'
+    - 'extension/**'
+    - 'Cargo.toml'
+    - 'Cargo.lock'
+    - '.github/workflows/extensions.yml'
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Install dependencies
+      run: |
+        rustup toolchain update stable --no-self-update
+        rustup default stable
+        rustup component add clippy rustfmt
+    - name: Run rustfmt
+      run: cargo fmt -- --check
+    - name: Run clippy
+      run: cargo clippy --all -- -Dwarnings
+
+  test:
+    runs-on: ubuntu-latest
+    container:
+      image: xd009642/tarpaulin
+      options: --security-opt seccomp=unconfined
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Test & Coverage
+      run: cargo tarpaulin --verbose --no-default-features --workspace --timeout 240
+
   build:
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest]
-
+        arrays: [
+          os: { tag: "windows-latest", target: "i686-pc-windows-msvc" },
+          os: { tag: "windows-latest", target: "x86_64-pc-windows-msvc" },
+        ]
+    runs-on: ${{ matrix.arrays.os.tag }}
     steps:
     - name: Checkout the source code
       uses: actions/checkout@v4
+    - name: Install stable Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        target: ${{ matrix.arrays.os.target }}
+        toolchain: stable
+        default: true
+    - name: Rust Cache
+      uses: Swatinem/rust-cache@v2
     - name: Build
-      shell: cmd
-      run: |
-        cd extensions
-        mkdir build
-        cd build
-        cmake .. && cmake --build .
-    - name: Upload Artifact
+      run: cargo build --verbose
+    - name: Upload
       uses: actions/upload-artifact@v4
       with:
-        name: ace3_extensions-${{ matrix.os }}-debug
-        path: extensions/build
+        name: ${{ matrix.arrays.os.target }}
+        path: target/debug/ace.dll
+        if-no-files-found: error
+        retention-days: 30

.github/workflows/hemtt.yml

@@ -33,6 +33,8 @@ jobs:
         xcopy /e /h /q pullrequest\addons addons\
         xcopy /e /h /q pullrequest\optionals optionals\
         xcopy /e /h /q pullrequest\include include\
+        xcopy /y /h /q pullrequest\ace.dll ace.dll
+        xcopy /y /h /q pullrequest\ace_x64.dll ace_x64.dll
     - name: Run HEMTT build
       run: hemtt build
     - name: Rename build folder
@@ -42,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

@@ -15,7 +15,7 @@ jobs:
       with:
         toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
     - name: Install Mikero Tools
-      uses: arma-actions/mikero-tools@2023-01-04
+      uses: arma-actions/mikero-tools@2024-10-08
     - name: Download game data
       run: |
         Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip

.gitignore

@@ -2,8 +2,6 @@
 *.zip
 release/*
 releases/*
-extensions/vcproj32/*
-extensions/vcproj64/*
 .vscode/*
 hemtt
 hemtt.exe
@@ -20,4 +18,5 @@ CHANGELOG.md
 sqfvm.exe
 ArmaScriptCompiler.exe
 *.sqfc
+target/
 !extras/**/*.zip

.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,5 @@
+[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
+]

.hemtt/project.toml

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

AUTHORS.txt

@@ -6,6 +6,7 @@
 # request, preferably including an email address.
 
 # CORE TEAM
+BaerMitUmlaut
 Brett Mayson
 bux578 <[email protected]>
 commy2
@@ -25,6 +26,7 @@ Kieran
 kymckay
 mharis001 <[email protected]>
 MikeMF
+MiszczuZPolski
 NouberNou
 PabstMirror <[email protected]>
 Ruthberg <[email protected]>
@@ -40,6 +42,7 @@ Walter Pearce <[email protected]>
 11RDP-LoupVert <[email protected]>
 654wak654 <[email protected]>
 [BIG]Bull
+Abogado "regiregi22"
 ACCtomeek
 adam3adam <[email protected]>
 Adanteh
@@ -56,7 +59,6 @@ Arcanum417 <[email protected]>
 Arkhir <[email protected] >
 ARV187 aka Spark23
 Asgar Serran <[email protected]>
-BaerMitUmlaut
 Bamse <[email protected]>
 Barman75
 Bla1337