Master merge

.gitattributes

@@ -2,3 +2,13 @@
 *.png binary
 *.jpg binary
 *.paa binary
+
+# Change GitHub language categorization
+addons/**/*.cpp linguist-language=SQF
+addons/**/*.hpp linguist-language=SQF
+
+optionals/**/*.cpp linguist-language=SQF
+optionals/**/*.hpp linguist-language=SQF
+
+# Do not count hemtt includes in language usage stats
+include/* linguist-vendored

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,23 +4,37 @@ about: Create a report to help us improve
 title: ''
 labels: kind/bug
 assignees: ''
-
 ---
 
+<!--
+🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
+
+I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
+1. If I delete this entire template or parts of it and go my own path, the team may close my issue without further explanation or engagement.
+2. If I list multiple bugs/concerns in this one issue, the team may close my issue without further explanation or engagement.
+3. If I write an issue that has duplicates, the team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
+4. If I leave the title incomplete when filing the issue, the team may close my issue without further explanation or engagement.
+5. If I file something completely blank in the body, the team may close my issue without further explanation or engagement.
+6. If I file an issue without collecting logs (RPT file, etc...), the team may close my issue without further explanation or engagement. 
+
+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]
-_Make sure to reproduce the issue with only CBA and ACE3 on a newly created mission!_
+<!-- 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://ace3mod.com/img/wiki/user/issue_flowchart.png](this flowchart)!_
-- Go to ...
-- Click ...
-- See ...
+_Follow [https://ace3mod.com/img/wiki/user/issue_flowchart.png](this flowchart)!_
+
+1. _Go to ..._
+2. _Click ..._
+3. _See ..._
 
 **Expected behavior:**
 A clear and concise description of what you expected to happen.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,9 @@
 **When merged this pull request will:**
-- Describe what this pull request will do
-- Each change in a separate line
-- Include documentation if applicable
-- Respect the [Development Guidelines](https://ace3mod.com/wiki/development/)
-- Follow title standard `Component - Add|Fix|Improve|Change|Make|Remove bananas`
+- _Describe what this pull request will do_
+- _Each change in a separate line_
+
+### IMPORTANT
+
+- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3mod.com/).
+- [ ] [Development Guidelines](https://ace3mod.com/wiki/development/) are read, understood and applied.
+- [ ] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.

.github/release-drafter.yml

@@ -9,12 +9,14 @@ categories:
   - title: '**ADDED:**'
     labels:
       - 'kind/feature request'
+      - 'kind/added feature'
   - title: '**FIXED:**'
     labels:
       - 'kind/bug fix'
   - title: '**IMPROVED:**'
     labels:
       - 'kind/enhancement'
+      - 'kind/optimization'
   - title: '**CHANGED:**'
     labels:
       - 'kind/cleanup'
@@ -25,6 +27,7 @@ categories:
 
 exclude-labels:
   - 'ignore changelog'
+  - 'dependencies'
 
 change-template: '- $TITLE (#$NUMBER)'
 template: |

.github/workflows/extensions.yml

@@ -3,11 +3,7 @@ name: Extensions
 on:
   pull_request:
     paths:
-    - 'extensions/*'
-    - 'extensions/*/*'
-    - 'extensions/*/*/*'
-    - 'extensions/*/*/*/*'
-    - 'extensions/*/*/*/*/*'
+    - 'extensions/**'
 
 jobs:
   build:
@@ -22,7 +18,9 @@ jobs:
     - name: Build
       shell: cmd
       run: |
-        cd extensions/build
+        cd extensions
+        mkdir build
+        cd build
         cmake .. && cmake --build .
     - name: Upload Artifact
       uses: actions/upload-artifact@master

.github/workflows/pboproject.yml

@@ -0,0 +1,82 @@
+name: pboProject
+
+on:
+  push:
+    branches:
+    - master
+  pull_request_target:
+
+jobs:
+  pboproject:
+    runs-on: windows-2019
+    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@2021-11-06
+    - 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) {
+          Extract-7Zip -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@v2
+      with:
+        path: x\cba
+        ref: master
+        repository: CBATeam/CBA_A3.git
+    - name: Checkout ACE3
+      uses: actions/checkout@v2
+      with:
+        path: z\ace
+        persist-credentials: false
+    - name: Checkout pull request
+      uses: actions/checkout@v2
+      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\
+        xcopy /e /h /q pullrequest\addons z\ace\addons\
+        xcopy /e /h /q pullrequest\optionals z\ace\optionals\
+    - name: Setup build environment
+      run: |
+        subst P: .
+        pboproject -P
+        xcopy /e /h /q z\ace\tools\pDummies\A3\ui_f_enoch a3\ui_f_enoch\
+        xcopy /e /h /q z\ace\tools\pDummies\gm gm\
+        xcopy /e /h /q z\ace\tools\pDummies\vn vn\
+    - name: Build
+      run: py P:\z\ace\tools\make.py ci
+      env:
+        PYTHONUNBUFFERED: 1
+    - name: Archive logs
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: logs
+        path: temp/*.log
+    - name: Archive @ace
+      uses: actions/upload-artifact@v2
+      with:
+        name: '@ace3-${{ github.sha }}'
+        path: z\ace\release\@ace

.gitignore

@@ -2,6 +2,9 @@
 *.zip
 release/*
 releases/*
+extensions/vcproj32/*
+extensions/vcproj64/*
+.vscode/*
 hemtt
 hemtt.exe
 tools/temp
@@ -13,3 +16,6 @@ texHeaders.bin
 *.biprivatekey
 Thumbs.db
 CHANGELOG.md
+sqfvm.exe
+ArmaScriptCompiler.exe
+*.sqfc

AUTHORS.txt

@@ -9,6 +9,7 @@
 Brandon (TCVM) <brandondanyluk366@gmail.com>
 bux578 <github@jonathandavid.de>
 commy2
+Dahlgren
 esteldunedain <nicolas.d.badano@gmail.com>
 Felix Wiegand <koffeinflummi@gmail.com>
 Garth "L-H" de Wet <garthofhearts@gmail.com>
@@ -18,19 +19,22 @@ Janus
 jokoho482 <jokoho482@gmail.com>
 Jonpas <jonpas33@gmail.com>
 Kieran
+mharis001 <mhariszakar@gmail.com>
 NouberNou
 PabstMirror <pabstmirror@gmail.com>
 Ruthberg <ulteq@web.de>
 SilentSpike <SilentSpike100@gmail.com>
 tpM
+veteran29
 ViperMaul
 VKing <kauestad@gmail.com>
 Walter Pearce <jaynus@gmail.com>
 
 # CONTRIBUTORS
-[BIG]Bull
+10Dozen a.k.a Dusin
 11RDP-LoupVert <loupvert@11rdp.fr>
 654wak654 <ozanegitmen@gmail.com>
+[BIG]Bull
 ACCtomeek <tomeek99@gmail.com>
 adam3adam <br.ada@seznam.cz>
 Adanteh
@@ -41,10 +45,10 @@ Aleksey EpMAK Yermakov <epmak777@gmail.com>
 Alganthe <alganthe@live.fr>
 Andrea "AtixNeon" Verano <veranoandrea88@gmail.com>
 Anthariel <Contact@storm-simulation.com>
-Arcanum417 <lubos.len@gmail.com>
 Anton
 Arcanum417 <lubos.len@gmail.com>
 Arkhir <wonsz666@gmail.com >
+ARV187 aka Spark23
 Asgar Serran <piechottaf@web.de>
 BaerMitUmlaut
 Bamse <bamsis@gmail.com>
@@ -53,26 +57,31 @@ Bla1337
 BlackPixxel <blackpixxel96@gmail.com>
 BlackQwar
 Brakoviejo
+Brett Mayson
 Brisse <brisse@outlook.com>
 Brostrom.A | Evul <andreas.brostrom.ce@gmail.com>
 BullHorn <bullhorn7@gmail.com>
+C0kkie
 chris579 <github@klemm.one>
 classicarma
 Clon1998 <ps.patti1998@gmail.com>
 Codingboy
 Coren <coren4@gmail.com>
 Crusty
+dabako <dabako@dabakoworld.de>
 C0kkie
 dgibso29 <gibson@earringpranks.com>
 Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
 Dimaslg <dimaslg@telecable.es>
 diwako
 dixon13 <dixonbegay@gmail.com>
+Drift_91
 Drill <drill87@gmail.com>
-Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Drofseh <drofseh@gmail.com>
 Dslyecxi <dslyecxi@gmail.com>
+Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Eclipser <jms@modeemi.fi>
+Elgin675
 ElTyranos
 eRazeri
 evromalarkey <evromalarkey@gmail.com>
@@ -85,7 +94,9 @@ FFAAMOD <modffaa@gmail.com>
 Filip Basara <filip.basara93@googlemail.com>
 fr89k <kaschitoku@web.de>
 Fragment
+Frank <frankplow@protonmail.com>
 FreeZbe <freeseb@gmail.com>
+Fyuran <dankemedic@hotmail.com>
 geraldbolso1899
 Ghost
 Gianmarco Varriale (TeamNuke) <admin@forhost.org>
@@ -100,11 +111,14 @@ havena <silveredenis@gmail.com>
 Hawkins
 Head <brobergsebastian@gmail.com>
 Hybrid V
+JasperRab <jasper@jasperrab.eu>
 john681611 <john681611@hotmail.com>
+JoramD
 Karneck <dschultz26@hotmail.com>
 Kavinsky <nmunozfernandez@gmail.com>
 Keithen <Keithen.Neu@gmail.com>
 Kllrt <kllrtik@gmail.com>
+KokaKolaA3
 legman <juicemelon@msn.com>
 Legolasindar "Viper" <legolasindar@gmail.com>
 licht-im-Norden87 <lichtimnorden87@gmail.com>
@@ -114,9 +128,9 @@ Luigi "Luigium" Myrini <luigium@outlook.fr>
 Macusercom <macusercom@gmail.com>
 MarcBook
 meat <p.humberdroz@gmail.com>
-mharis001 <mhariszakar@gmail.com>
 Michail Nikolaev
 MikeMatrix <m.braun92@gmail.com>
+mjc4wilton <mjc4wilton@gmail.com>
 nic547 <nic547@outlook.com>
 nikolauska <nikolauska1@gmail.com>
 nomisum <nomisum@gmail.com>
@@ -125,8 +139,8 @@ Orbis2358 <mgkid3310@naver.com>
 oscarmolinadev
 Panisher (Tushino Serious Games) <panisher333@gmail.com>
 PaxJaromeMalues <seemax1991@gmail.com>
-PiZZADOX <509thParachuteInfantry@gmail.com>
 Phyma <sethramstrom@gmail.com>
+PiZZADOX <509thParachuteInfantry@gmail.com>
 pokertour
 Professor <lukas.trneny@wo.cz>
 Pterolatypus <pterolatypus@gmail.com>
@@ -138,7 +152,10 @@ Riccardo Petricca <petriccarcc@gmail.com>
 Robert Boklahánics <bokirobi@gmail.com>
 ruPaladin <happyworm24@rambler.ru>
 Rutger "RedBery" Meijering <c.redbery@gmail.com>
+sancron
 Schwaggot <tom.ryan@posteo.de>
+Seb <sebsmith90@gmail.com>
+shukari
 simon84 <badguy360th@gmail.com>
 Skengman2
 Smith <smitt14ua@gmail.com>
@@ -152,11 +169,13 @@ Toaster <jonathan.pereira@gmail.com>
 Tonic
 Tourorist <tourorist@gmail.com>
 Tuupertunut
+TyroneMF <TyroneMF@hotmail.com>
 Valentin Torikian <valentin.torikian@gmail.com>
-veteran29
 voiper
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
+Walthzer <walthzer.69@gmail.com>
 Winter <simon@agius-muscat.net>
+wizpig64
 xrufix
 Zakant <Zakant@gmx.de>
 zGuba