From 12795037431fd83718bc169340a1e2758dd16af8 Mon Sep 17 00:00:00 2001 From: hizumi Date: Thu, 22 Feb 2024 23:19:28 -0600 Subject: [PATCH 1/5] Delete .gitea/workflows/create-testing-snapshot.yaml --- .gitea/workflows/create-testing-snapshot.yaml | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 .gitea/workflows/create-testing-snapshot.yaml diff --git a/.gitea/workflows/create-testing-snapshot.yaml b/.gitea/workflows/create-testing-snapshot.yaml deleted file mode 100644 index 5fb5877..0000000 --- a/.gitea/workflows/create-testing-snapshot.yaml +++ /dev/null @@ -1,71 +0,0 @@ -name: Generate testing snapshot -on: - push: - branches: [develop] - -jobs: - Clean: - name: Create testing release - runs-on: windows - steps: - - name: Diagnostics - run: | - echo "repository: ${{ gitea.repository }}" - echo "ref: ${{ gitea.ref }}" - echo "ref_name: ${{ gitea.ref_name }}" - echo "sha: ${{ gitea.sha }}" - echo "api_url: ${{ gitea.api_url }}" - echo "workflow: ${{ gitea.workflow }}" - - - name: Checkout framework - uses: actions/checkout@v3 - with: - path: MissionFramework - - - name: Clean framework - run: | - Remove-Item -Recurse MissionFramework\aaFrameworkUtils - Remove-Item -Recurse MissionFramework\framework\x - Remove-Item -Recurse MissionFramework\.git* - - - name: Backup artifacts from runner - uses: actions/upload-artifact@v3 - with: - name: framework-test-snapshot - path: MissionFramework - - - name: Create archive - run: Compress-Archive MissionFramework framework-test-snapshot.zip - - - name: Delete old testing-release release - run: | - $headers = @{ - "accept" = "application/json" - "Authorization" = "token ${{secrets.RELEASE_TOKEN}}" - } - Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/tags/testing-release" -Method Delete -Headers $headers - - - name: Delete old testing-release tag - run: | - $headers = @{ - "accept" = "application/json" - "Authorization" = "token ${{secrets.RELEASE_TOKEN}}" - } - Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/tags/testing-release" -Method Delete -Headers $headers - - - name: Create new testing-release tag - run: | - $headers = @{ - "accept" = "application/json" - "Authorization" = "token ${{secrets.RELEASE_TOKEN}}" - } - Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/tags" -Method Post -Headers $headers -ContentType "application/json" -Body "{`"message`": `"testing-release`", `"tag_name`": `"testing-release`", `"target`": `"${{ gitea.sha }}`"}" - - - name: Create new testing-release - uses: https://gitea.com/actions/gitea-release-action@v1.1.6 - with: - tag_name: 'testing-release' - name: 'testing-release' - prerelease: true - files: |- - framework-test-snapshot.zip From 3e4eda28431d9015bd937943af4c1ef35221a291 Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Thu, 22 Feb 2024 23:23:12 -0600 Subject: [PATCH 2/5] Update on-push-devel.yaml --- .gitea/workflows/on-push-devel.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/on-push-devel.yaml b/.gitea/workflows/on-push-devel.yaml index 32ca8c6..09db33c 100644 --- a/.gitea/workflows/on-push-devel.yaml +++ b/.gitea/workflows/on-push-devel.yaml @@ -41,7 +41,7 @@ jobs: run: | $headers = @{ "accept" = "application/json" - "Authorization" = "token ${{secrets.RELEASE_TOKEN}}" + "Authorization" = "token ${{ gitea.token }}" } Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/tags/testing-release" -Method Delete -Headers $headers @@ -49,7 +49,7 @@ jobs: run: | $headers = @{ "accept" = "application/json" - "Authorization" = "token ${{secrets.RELEASE_TOKEN}}" + "Authorization" = "token ${{ gitea.token }}" } Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/tags/testing-release" -Method Delete -Headers $headers @@ -57,7 +57,7 @@ jobs: run: | $headers = @{ "accept" = "application/json" - "Authorization" = "token ${{secrets.RELEASE_TOKEN}}" + "Authorization" = "token ${{ gitea.token }}" } Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/tags" -Method Post -Headers $headers -ContentType "application/json" -Body "{`"message`": `"testing-release`", `"tag_name`": `"testing-release`", `"target`": `"${{ gitea.sha }}`"}" From 737f1ef7ee9dcc3053592bf103e1ba96b17fc760 Mon Sep 17 00:00:00 2001 From: IndigoFox Date: Sat, 24 Feb 2024 19:45:55 -0800 Subject: [PATCH 3/5] skip respawn button log if no last uncon timer registered --- framework/client/functions/fn_logRespawnButtonUse.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/client/functions/fn_logRespawnButtonUse.sqf b/framework/client/functions/fn_logRespawnButtonUse.sqf index ec085e6..8d350a0 100644 --- a/framework/client/functions/fn_logRespawnButtonUse.sqf +++ b/framework/client/functions/fn_logRespawnButtonUse.sqf @@ -12,9 +12,9 @@ if ( !hasInterface ) exitWith {}; if (_causeOfDeath != "respawn_button") exitWith {}; private _timeWentUnconscious = _unit getVariable [QGVARMAIN(lastTimeKnockedOut), -1]; private _durationSpentUnconscious = -1; - if (_timeWentUnconscious != -1) then { - _durationSpentUnconscious = diag_tickTime - _timeWentUnconscious; - }; + if (_timeWentUnconscious isEqualTo -1) exitWith {}; + + _durationSpentUnconscious = diag_tickTime - _timeWentUnconscious; [ LEVEL_INFO, From 53a8b782e6e1e3bdd95a296167dcb9644d84195b Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Fri, 1 Mar 2024 23:49:25 -0600 Subject: [PATCH 4/5] Update README.md newer file structure, release link, and new file purposes --- README.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8db018b..31285ae 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,10 @@ The only file which should be pre-existing in your mission folder is `mission.sqm`, once freshly saved from Arma 3's EDEN Editor. -Download the latest mission template zip from the [latest release](https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/releases/latest) and copy its contents to the folder where your mission file lives. +Download the latest mission template zip from the [latest release](https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/MissionTemplate/releases/latest) and copy its contents to the folder where your mission file lives. Once copied, the final structure should appear similar to the following: -```markdown -├── aaFrameworkUtils/ +``` ├── defines/ ├── framework/ ├── images/ @@ -14,13 +13,17 @@ Once copied, the final structure should appear similar to the following: ├── sounds/ ├── textures/ ├── CHANGELOG.md +├── custom_leaflets.hpp +├── custom_scripts.hpp +├── CHANGELOG.md ├── description.ext -├── mission_settings.hpp ├── mission.jpg ├── mission.sqm +├── mission_settings.hpp +├── README.md ``` -> **Note:** If you're building a mission for use and not actively developing code, the `aaFrameworkUtils` and `framework\x` directories **should be deleted**. *These are for the purposes of development and add size bloat to the mission download when players connect to your mission.* +> **Note:** If you're building a mission for use and not actively developing code, you should download the `mission-maker-template` zip file which is a cleaned version of this framework. The `aaFrameworkUtils` and `framework\x` directories in the source tree are for the purposes of development and would only add size bloat to the mission download when players connect to your mission. After the requisite configuration file edits have been made, your mission is ready to be packed into a pbo for deployment. @@ -38,13 +41,21 @@ Almost none of the template files should be edited in anyway as they have been f The contents of this file must be edited to reflect the naming of your mission for display purposes. All variables are self-documented inside the file to clearly identify the purpose of each piece of required text -The contents of the lower half of the file are where the mission maker is able to add/replace/modify the built in `#ace-fortify` preset +The contents of the lower half of the file contain templated declaration blocks where the mission maker can define custom waypoints to be automatically added to the ACE MicroDAGR, and define/edit the custom built in `#ace-fortify` preset. ## mission.jpg This file will be displayed the client mission loading screen. File should remain small *(under 300KiB)* and should optimally be `1024px by 512px` in resolution +## custom_leaflets.hpp + +This file contains the temeplate block for declaring custom leaflets to be used within missions. + +## custom_scripts.hpp + +This file contains an accessbile `CfgFunctions` declaration block for custom functions which require setup in this manner. + ## defines/ This directory contains the definition files use by the framework in various places. *Contents should not be edited* @@ -124,3 +135,4 @@ This directory contains a number of hpp files used to define constants throughou - Provides an ACE3 interaction menu that allows players to attach and remove flags from vehicles. - Flags are defined in `defines/VehicleFlags.hpp`. +c \ No newline at end of file From 073f5ffd638b417f6d9e793e26a98aaad1dc78da Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Fri, 1 Mar 2024 23:49:35 -0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a9d14f..1c013ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.1.0] - 2024-03-01 + +### Added + +- Added ability for mission maker to use custom leaflets +- Added ability for mission maker to define points of interested to be automatically added as MicroDAGR waypoints +- Added `missionGroup` variable in `description.ext` for backend grouping of mission +- Added custom script support via `CfgFunctions` +- Added 5 second invulnerability on ejection of air vehicle when parachute equipped + +### Changed + +- Track unconsciousness time + ## [4.0.0] - 2024-02-07 Version 4 marks a massive rewrite due in whole to @IndigoFox by updating the internals of the framework into CBA macros and functions.