Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added gui helper functions #2387

Merged

Conversation

HakonRydland
Copy link
Collaborator

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

Information:
Added helper functions for GUI work with controls groups

Please specify which Issue this PR Resolves.

closes #XXXX

Please verify the following and ensure all checks are completed.

  1. Have you loaded the mission in LAN host?
  2. Have you loaded the mission on a dedicated server?

Is further testing or are further changes required?

  1. No
  2. Yes (Please provide further detail below.)

How can the changes be tested?

Steps:


Notes:

@HakonRydland HakonRydland added the Enhancement New feature or request label Jun 25, 2022
@HakonRydland HakonRydland added this to the 2.5.X milestone Jun 25, 2022
Copy link

@killerswin2 killerswin2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This maybe required for selector.

@killerswin2 killerswin2 added the Not now Please don't work on this until this tag is removed. label Jun 25, 2022
@Bob-Murphy Bob-Murphy removed the Not now Please don't work on this until this tag is removed. label Jun 25, 2022
@Bob-Murphy Bob-Murphy merged commit 15ce599 into official-antistasi-community:unstable Jun 25, 2022
@HakonRydland HakonRydland deleted the ctrlGroups branch August 1, 2022 22:14
Bob-Murphy added a commit that referenced this pull request Aug 22, 2022
* formatted changelog (#2367)

* formatted changelog
changed file extension to `.rst`

* fixed different section markers

* Fix suggested Modlists (#2357)

* Fix suggested Modlistss

* Update README.md

Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>

* Template Update (RHS, 3CB Factions) (#2333)

# RHS:

Same Tratement as #2278,
moved most Magnified Optics to slRifles,
Update Militias Looks,
Update SL, Marksman, Sniper,
Update US Army/ Marines Tank Array.
Reduced Amount of Rockets given slightly,
Tabs to Spaces,
Add Arctic US Army, same as Temperate just different Uniforms for the Terrain.
Removed the Funny IFV/Light APC Categories,
Removed Rebell Heli which doesent exist,
Removed Civ Heli which doesent exist.
Fixed a copy paste Mistake for Voices and Faces in AFRF.
"Downgrade" Russian Gear a bit.

# 3CB Factions

Added 3CB MEE Camos to Garage Blacklist,
removed 3CB MEE Facewear,
Added LDF, KRG Faction Templates.
Added Nodes for the New Vehicles (T810 Armed, Unarmed, Recovery Variant and M270 Carrier)
Added M270 MLRS, FV420, Bell412 Helicopters and Mig 21s to Factions that got them or would be appropiate to have.
Changed CIV Mi8 for Civ Bell412 for CNM.
Added Tank to Objects to Load Cargo into, as the M270 Carrier counts as Tank.

* Add ToFixed to the rest of Numbers being Displayed for Consistency (#2369)

Same treatment as #2321 for consistency, in theory its not needed as its probably very Rare to reach that much Personal Money/HR.
And Killed one Singleplayer Line in the process.

* Typo

* Templates - CUP Blufor updates for consistency with ACR changes (#2380)

* added sf markman items to blufor templates

* added LoadoutData overrides for item extras for sf marksman

* changed sf binocular for blufor to SOFLAM

* added gui helper functions (#2387)

* added gui helper functions

* removed excecive debug lines

* corrected include paths

* started use of directChildCtrls and mad cfgFunctions use the ADDON macro

* Fix behaviour and remoteExec bugs in undercover AI

* Block Arma rating changes for players to prevent them getting attacked by rebel AIs

* Rework garage placement rotation

* Fix bad JIP marker colours and refactor (#2392)

* Fix bad JIP marker colours and refactor

* Missed a -Local

* Update french translations (#2347)

* 📝 First batch of french translation

* 📝 Second batch of french translation

* 📝 Third batch of french translation

* 📝 Fourth batch

* 📝 Fifth batch

* 📝 Sixth and (hopefully) last batch

* ✏️ Fixes from request

* ✏️ Fixes from request

* fixed typo for sara mapname_short

* Remove Petros's Face from Ai Faces

* Removing english entries from stringtables

* changed cup a10 to CUP_B_A10_DYN_USA

* Template change

* Facewear support for AI loadouts (#2395)

* Adds class "loadout_setFacewear"

* Adds fn_loadout_setFacewear.sqf

This function will insert a given facewear item to a loadout array. The [7] position in loadout arrays specifies the equipped facewear, which is what this function modifies.

* Adds _fnc_setFacewear function

* Adds ability to equip facewear for rebel units

* Adds facewear to the FIA template

* Adds facewear to the AAF template

Specific to the AAF template, there are also comments with details on setting up facewear items for other templates, and how the weight system works.

* Removed facewear setup explanation comment

Instructed to move comment to FIA template file

* Added facewear setup explanation comment

Previously was in AAF template file, instructed to move it here

* Updated author, formatting fix (line 17)

* Moved facewear setup explanation comment to example templates

* Fixed wrong function being used to set facewear

* Removed documentation, weight setup being changed

* Simplified weight setup into template files. Changed facewear equip method for rebel loadout template.

* Fixed error with previous commit

* Removed facewear function in fn_equipRebel as it is now handled in the rebel faction's template

* Implemented rebel facewear setup changes to example file

* Replaced "!EMPTY" with blank string ""

* Facewear implementation to loadout verification

* Simplified facewear randomization into categories

* Simplified facewear examples

* Further example simplification

* Adjusted weights

* Update README.md

* Vn update for Unstable (#2415)

* Update fn_categoryOverrides.sqf

* Undo Accident

* Update fn_setPlaneLoadout.sqf

* Update Templates for Unstable

* Update VN_AI_PAVN.sqf

* Update VN_AI_PAVN.sqf

* added logging of debug code execution with name and UID (#2403)

* added logging of debug code execution with name and UID

* parameterised logging of debug console

* corrected typo

* corrected incorrect logic, resolved live update issues

* Hr events (#2254)

* initial event itteration (untested)

* corrected cfgFunctions and config

* fixed wrong argument passed to remoteExecCall

* added first event hook

* added new macros for detecting if an addon is loaded

* made events require registration before use,
throws warning otherwise

* - corrected incorrect overwrite check in addEvent listener
- added param sanity checking to modifying event functions
- fixed remove all events to not remove the event from the registry but clear it instead

* - moved to config defined events with params validation (disabled for now)
- simplified event trigger

* fixed broken events config.cpp

* added flag for event locality in config (for users sake)

* added headers

* typos

* added multiple new events

* removed case sensitivity for argument validation

* typos

* corrected errors with event triggers (#2423)

closes #2422
* added missing include in vehicleBoxHeal

* added missing include in buildHQ

* added missing inclue in civVEHInit

* moved fuinction call to addAction target instead of cursorObject

* solved possible null variable issue with triggerEvent call

* Revert "Stop god carry"

* Quality-of-life looting/logistics tweaks (#2418)

* Looting/logistics tweaks:
- Switch loot crate carrying from forceWalk true to allowSprint false
- Enabled buying loot crates from any rebel flag
- Fixed incorrect bounding box calc for load/unload
- Changed load/unload speed to be independent of script load

* Prevent killing people (including self) with loot crates

* Fix arsenal weapon switch duping magazines into arsenal since A3 2.07

* Enemy near changes (#2381)

* added parameter

* using the Parameter instead of constants

* needs to be an array

* review changes

* weird gitness

* garage enemyNearCheck changed

* review changes, removed getPos

* review changes, remove return

* review changes, remove 0

* review changes, combined enemiesEngaging and enemyNear

* added getPosATL to objects

* Fix rebel static mounting on DS (#2411)

* Fix rebel static mounting on DS

* Fixed stupid bug added while branch-swapping

* Template verification (#2439)

* turn off verification

* macro if

* Fix leftover setStartTime from #2439

Co-authored-by: Giddius <GordonGrossmann@gmx.at>
Co-authored-by: Peter <GitHub@Stather.me>
Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Co-authored-by: Lazejun <57111907+Lazejun@users.noreply.github.com>
Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>
Co-authored-by: HakonRydland <61709767+HakonRydland@users.noreply.github.com>
Co-authored-by: Théo Ackermann <38220718+zayfix@users.noreply.github.com>
Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Co-authored-by: dZ <92134872+UltimateFlash15@users.noreply.github.com>
Co-authored-by: Håkon <hrr1@hotmail.no>
Bob-Murphy added a commit that referenced this pull request Oct 15, 2022
* altis update

Added seaAttackSpawner
moved carrier markers closer
added fuel on NW airfield
updated fuelstation list to handle all BI fuelstations

* malden update

Disabled village Malden_L_Moray
updated fuelstation list to handle all BI fuelstations

* tanoa update

Added new outpost on NNE Island
updated fuelstation list to handle all BI fuelstations

* livonia/enoch update

Added 4 Fuelstations
moved carrier markers closer
updated fuelstation list to handle all BI fuelstations

* stratis update

Added fuelstation close to spawn
updated fuelstation list to handle all BI fuelstations

* malden antenna update

added antenna list and blacklisted 2

* navGrid update

- added metadata
- fixed capitalisation

* altis update

comment added in mapInfo

* chernarus_summer update

- added one large prefab tower at each airfield
- added one fuel station at outpost 18
- added all possible CUP fuelstations to mapinfo
- updated INV positions
- added town to disable

* chernarus_winter update

- added one large prefab tower at each airfield
- added one fuel station at outpost 18
- added all possible CUP fuelstations to mapinfo
- updated INV positions
- added town to disable

* chernarus autumn port

Ported Chernarus Autumn to other cherno standard

- added one large prefab tower at each airfield
- added one fuel station at outpost 18
- added all possible CUP fuelstations to mapinfo
- updated INV positions
- added town to disable

* Sahrani update

- fixed population data
- added 4 additional fuel stations
- added 3 additional radio towers
- fixed #1686
- fixed #2258

* Takistan update

- fixed population data
- added 2 additional radio towers
- added all CUP fuelstations
- added comments in mapinfo

* initZones update

- added more possible CUP fuelstations

* all cherno update

- deleted h-barriers on top of building at a resource that float if building is destroyed

* Anizay update

- fixed and added radiotowers that are now working
- set up fuel stations and manually added one
- overhauled all vehicle markers
- overhauled a few outposts
- overhauled a few resources
- overhauled whole asset folder structure

* Virolahti update

- adapted pop
- adapted disabledTowns
- added banks
- updated folder structure
- adapted all vehicle markers
- added 5 fuel stations

* Chernarus update

- checked and adapted all vehicle markers where necessary

* virolahti update

disable nopala #2221

* Implement Khe Sanh port into map overhaul

* tanoa nav grid update

* tanoa map update

- added 2 hide modules to airport_3
- put 2 hide modules of outpost_16 into the right folder

* cam lao nam fuel update

* update fuelStationTypes in fn_initZones

* Update mapInfo.hpp

* map config fixes

* Update config.cpp

* Update Templates.hpp

* Merge unstable into map-overhaul because Bob is bad at Git (#2442)

* formatted changelog (#2367)

* formatted changelog
changed file extension to `.rst`

* fixed different section markers

* Fix suggested Modlists (#2357)

* Fix suggested Modlistss

* Update README.md

Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>

* Template Update (RHS, 3CB Factions) (#2333)

# RHS:

Same Tratement as #2278,
moved most Magnified Optics to slRifles,
Update Militias Looks,
Update SL, Marksman, Sniper,
Update US Army/ Marines Tank Array.
Reduced Amount of Rockets given slightly,
Tabs to Spaces,
Add Arctic US Army, same as Temperate just different Uniforms for the Terrain.
Removed the Funny IFV/Light APC Categories,
Removed Rebell Heli which doesent exist,
Removed Civ Heli which doesent exist.
Fixed a copy paste Mistake for Voices and Faces in AFRF.
"Downgrade" Russian Gear a bit.

# 3CB Factions

Added 3CB MEE Camos to Garage Blacklist,
removed 3CB MEE Facewear,
Added LDF, KRG Faction Templates.
Added Nodes for the New Vehicles (T810 Armed, Unarmed, Recovery Variant and M270 Carrier)
Added M270 MLRS, FV420, Bell412 Helicopters and Mig 21s to Factions that got them or would be appropiate to have.
Changed CIV Mi8 for Civ Bell412 for CNM.
Added Tank to Objects to Load Cargo into, as the M270 Carrier counts as Tank.

* Add ToFixed to the rest of Numbers being Displayed for Consistency (#2369)

Same treatment as #2321 for consistency, in theory its not needed as its probably very Rare to reach that much Personal Money/HR.
And Killed one Singleplayer Line in the process.

* Typo

* Templates - CUP Blufor updates for consistency with ACR changes (#2380)

* added sf markman items to blufor templates

* added LoadoutData overrides for item extras for sf marksman

* changed sf binocular for blufor to SOFLAM

* added gui helper functions (#2387)

* added gui helper functions

* removed excecive debug lines

* corrected include paths

* started use of directChildCtrls and mad cfgFunctions use the ADDON macro

* Fix behaviour and remoteExec bugs in undercover AI

* Block Arma rating changes for players to prevent them getting attacked by rebel AIs

* Rework garage placement rotation

* Fix bad JIP marker colours and refactor (#2392)

* Fix bad JIP marker colours and refactor

* Missed a -Local

* Update french translations (#2347)

* 📝 First batch of french translation

* 📝 Second batch of french translation

* 📝 Third batch of french translation

* 📝 Fourth batch

* 📝 Fifth batch

* 📝 Sixth and (hopefully) last batch

* ✏️ Fixes from request

* ✏️ Fixes from request

* fixed typo for sara mapname_short

* Remove Petros's Face from Ai Faces

* Removing english entries from stringtables

* changed cup a10 to CUP_B_A10_DYN_USA

* Template change

* Facewear support for AI loadouts (#2395)

* Adds class "loadout_setFacewear"

* Adds fn_loadout_setFacewear.sqf

This function will insert a given facewear item to a loadout array. The [7] position in loadout arrays specifies the equipped facewear, which is what this function modifies.

* Adds _fnc_setFacewear function

* Adds ability to equip facewear for rebel units

* Adds facewear to the FIA template

* Adds facewear to the AAF template

Specific to the AAF template, there are also comments with details on setting up facewear items for other templates, and how the weight system works.

* Removed facewear setup explanation comment

Instructed to move comment to FIA template file

* Added facewear setup explanation comment

Previously was in AAF template file, instructed to move it here

* Updated author, formatting fix (line 17)

* Moved facewear setup explanation comment to example templates

* Fixed wrong function being used to set facewear

* Removed documentation, weight setup being changed

* Simplified weight setup into template files. Changed facewear equip method for rebel loadout template.

* Fixed error with previous commit

* Removed facewear function in fn_equipRebel as it is now handled in the rebel faction's template

* Implemented rebel facewear setup changes to example file

* Replaced "!EMPTY" with blank string ""

* Facewear implementation to loadout verification

* Simplified facewear randomization into categories

* Simplified facewear examples

* Further example simplification

* Adjusted weights

* Update README.md

* Vn update for Unstable (#2415)

* Update fn_categoryOverrides.sqf

* Undo Accident

* Update fn_setPlaneLoadout.sqf

* Update Templates for Unstable

* Update VN_AI_PAVN.sqf

* Update VN_AI_PAVN.sqf

* added logging of debug code execution with name and UID (#2403)

* added logging of debug code execution with name and UID

* parameterised logging of debug console

* corrected typo

* corrected incorrect logic, resolved live update issues

* Hr events (#2254)

* initial event itteration (untested)

* corrected cfgFunctions and config

* fixed wrong argument passed to remoteExecCall

* added first event hook

* added new macros for detecting if an addon is loaded

* made events require registration before use,
throws warning otherwise

* - corrected incorrect overwrite check in addEvent listener
- added param sanity checking to modifying event functions
- fixed remove all events to not remove the event from the registry but clear it instead

* - moved to config defined events with params validation (disabled for now)
- simplified event trigger

* fixed broken events config.cpp

* added flag for event locality in config (for users sake)

* added headers

* typos

* added multiple new events

* removed case sensitivity for argument validation

* typos

* corrected errors with event triggers (#2423)

closes #2422
* added missing include in vehicleBoxHeal

* added missing include in buildHQ

* added missing inclue in civVEHInit

* moved fuinction call to addAction target instead of cursorObject

* solved possible null variable issue with triggerEvent call

* Revert "Stop god carry"

* Quality-of-life looting/logistics tweaks (#2418)

* Looting/logistics tweaks:
- Switch loot crate carrying from forceWalk true to allowSprint false
- Enabled buying loot crates from any rebel flag
- Fixed incorrect bounding box calc for load/unload
- Changed load/unload speed to be independent of script load

* Prevent killing people (including self) with loot crates

* Fix arsenal weapon switch duping magazines into arsenal since A3 2.07

* Enemy near changes (#2381)

* added parameter

* using the Parameter instead of constants

* needs to be an array

* review changes

* weird gitness

* garage enemyNearCheck changed

* review changes, removed getPos

* review changes, remove return

* review changes, remove 0

* review changes, combined enemiesEngaging and enemyNear

* added getPosATL to objects

* Fix rebel static mounting on DS (#2411)

* Fix rebel static mounting on DS

* Fixed stupid bug added while branch-swapping

* Template verification (#2439)

* turn off verification

* macro if

* Fix leftover setStartTime from #2439

Co-authored-by: Giddius <GordonGrossmann@gmx.at>
Co-authored-by: Peter <GitHub@Stather.me>
Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Co-authored-by: Lazejun <57111907+Lazejun@users.noreply.github.com>
Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>
Co-authored-by: HakonRydland <61709767+HakonRydland@users.noreply.github.com>
Co-authored-by: Théo Ackermann <38220718+zayfix@users.noreply.github.com>
Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Co-authored-by: dZ <92134872+UltimateFlash15@users.noreply.github.com>
Co-authored-by: Håkon <hrr1@hotmail.no>

* deleted duplicated entry

* fixed double speechmark breaking initZones

* fixes including #2451

* CLN and KS update

* Kunduz update

* Tembelan update

* whiteboard updates

* Cherno Autumn cover update

* Fixed Takistans broken antennas - tested

* Anizay slot order fix

* fix kunduz antennas

* Sahrani update

* Malden update & wrong picture fix

* cherno new antenna at outpost 9

* further cherno update

* Livonia update

* SOGPF whiteboard & logic update

* init switchcase improvement

* Tembelan update

* Khe Sanh cover and string update

* Altis moved support corridors

* another altis support corridor change

* Khe Sanh additions

* livonia - add control_2

Co-authored-by: Caleb Serafin <calebserafin@outlook.com>
Co-authored-by: jaj22 <jaj22x@gmail.com>
Co-authored-by: Giddius <GordonGrossmann@gmx.at>
Co-authored-by: Peter <GitHub@Stather.me>
Co-authored-by: Lazejun <57111907+Lazejun@users.noreply.github.com>
Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>
Co-authored-by: HakonRydland <61709767+HakonRydland@users.noreply.github.com>
Co-authored-by: Théo Ackermann <38220718+zayfix@users.noreply.github.com>
Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Co-authored-by: dZ <92134872+UltimateFlash15@users.noreply.github.com>
Co-authored-by: Håkon <hrr1@hotmail.no>
@Bob-Murphy Bob-Murphy added the Added to changelog Added to changelog label Dec 1, 2022
igorkis-scrts pushed a commit to igorkis-scrts/A3-Antistasi-Plus that referenced this pull request Aug 8, 2023
* added gui helper functions

* removed excecive debug lines

* corrected include paths

* started use of directChildCtrls and mad cfgFunctions use the ADDON macro
igorkis-scrts pushed a commit to igorkis-scrts/A3-Antistasi-Plus that referenced this pull request Aug 8, 2023
* altis update

Added seaAttackSpawner
moved carrier markers closer
added fuel on NW airfield
updated fuelstation list to handle all BI fuelstations

* malden update

Disabled village Malden_L_Moray
updated fuelstation list to handle all BI fuelstations

* tanoa update

Added new outpost on NNE Island
updated fuelstation list to handle all BI fuelstations

* livonia/enoch update

Added 4 Fuelstations
moved carrier markers closer
updated fuelstation list to handle all BI fuelstations

* stratis update

Added fuelstation close to spawn
updated fuelstation list to handle all BI fuelstations

* malden antenna update

added antenna list and blacklisted 2

* navGrid update

- added metadata
- fixed capitalisation

* altis update

comment added in mapInfo

* chernarus_summer update

- added one large prefab tower at each airfield
- added one fuel station at outpost 18
- added all possible CUP fuelstations to mapinfo
- updated INV positions
- added town to disable

* chernarus_winter update

- added one large prefab tower at each airfield
- added one fuel station at outpost 18
- added all possible CUP fuelstations to mapinfo
- updated INV positions
- added town to disable

* chernarus autumn port

Ported Chernarus Autumn to other cherno standard

- added one large prefab tower at each airfield
- added one fuel station at outpost 18
- added all possible CUP fuelstations to mapinfo
- updated INV positions
- added town to disable

* Sahrani update

- fixed population data
- added 4 additional fuel stations
- added 3 additional radio towers
- fixed official-antistasi-community#1686
- fixed official-antistasi-community#2258

* Takistan update

- fixed population data
- added 2 additional radio towers
- added all CUP fuelstations
- added comments in mapinfo

* initZones update

- added more possible CUP fuelstations

* all cherno update

- deleted h-barriers on top of building at a resource that float if building is destroyed

* Anizay update

- fixed and added radiotowers that are now working
- set up fuel stations and manually added one
- overhauled all vehicle markers
- overhauled a few outposts
- overhauled a few resources
- overhauled whole asset folder structure

* Virolahti update

- adapted pop
- adapted disabledTowns
- added banks
- updated folder structure
- adapted all vehicle markers
- added 5 fuel stations

* Chernarus update

- checked and adapted all vehicle markers where necessary

* virolahti update

disable nopala official-antistasi-community#2221

* Implement Khe Sanh port into map overhaul

* tanoa nav grid update

* tanoa map update

- added 2 hide modules to airport_3
- put 2 hide modules of outpost_16 into the right folder

* cam lao nam fuel update

* update fuelStationTypes in fn_initZones

* Update mapInfo.hpp

* map config fixes

* Update config.cpp

* Update Templates.hpp

* Merge unstable into map-overhaul because Bob is bad at Git (official-antistasi-community#2442)

* formatted changelog (official-antistasi-community#2367)

* formatted changelog
changed file extension to `.rst`

* fixed different section markers

* Fix suggested Modlists (official-antistasi-community#2357)

* Fix suggested Modlistss

* Update README.md

Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>

* Template Update (RHS, 3CB Factions) (official-antistasi-community#2333)

# RHS:

Same Tratement as official-antistasi-community#2278,
moved most Magnified Optics to slRifles,
Update Militias Looks,
Update SL, Marksman, Sniper,
Update US Army/ Marines Tank Array.
Reduced Amount of Rockets given slightly,
Tabs to Spaces,
Add Arctic US Army, same as Temperate just different Uniforms for the Terrain.
Removed the Funny IFV/Light APC Categories,
Removed Rebell Heli which doesent exist,
Removed Civ Heli which doesent exist.
Fixed a copy paste Mistake for Voices and Faces in AFRF.
"Downgrade" Russian Gear a bit.

# 3CB Factions

Added 3CB MEE Camos to Garage Blacklist,
removed 3CB MEE Facewear,
Added LDF, KRG Faction Templates.
Added Nodes for the New Vehicles (T810 Armed, Unarmed, Recovery Variant and M270 Carrier)
Added M270 MLRS, FV420, Bell412 Helicopters and Mig 21s to Factions that got them or would be appropiate to have.
Changed CIV Mi8 for Civ Bell412 for CNM.
Added Tank to Objects to Load Cargo into, as the M270 Carrier counts as Tank.

* Add ToFixed to the rest of Numbers being Displayed for Consistency (official-antistasi-community#2369)

Same treatment as official-antistasi-community#2321 for consistency, in theory its not needed as its probably very Rare to reach that much Personal Money/HR.
And Killed one Singleplayer Line in the process.

* Typo

* Templates - CUP Blufor updates for consistency with ACR changes (official-antistasi-community#2380)

* added sf markman items to blufor templates

* added LoadoutData overrides for item extras for sf marksman

* changed sf binocular for blufor to SOFLAM

* added gui helper functions (official-antistasi-community#2387)

* added gui helper functions

* removed excecive debug lines

* corrected include paths

* started use of directChildCtrls and mad cfgFunctions use the ADDON macro

* Fix behaviour and remoteExec bugs in undercover AI

* Block Arma rating changes for players to prevent them getting attacked by rebel AIs

* Rework garage placement rotation

* Fix bad JIP marker colours and refactor (official-antistasi-community#2392)

* Fix bad JIP marker colours and refactor

* Missed a -Local

* Update french translations (official-antistasi-community#2347)

* 📝 First batch of french translation

* 📝 Second batch of french translation

* 📝 Third batch of french translation

* 📝 Fourth batch

* 📝 Fifth batch

* 📝 Sixth and (hopefully) last batch

* ✏️ Fixes from request

* ✏️ Fixes from request

* fixed typo for sara mapname_short

* Remove Petros's Face from Ai Faces

* Removing english entries from stringtables

* changed cup a10 to CUP_B_A10_DYN_USA

* Template change

* Facewear support for AI loadouts (official-antistasi-community#2395)

* Adds class "loadout_setFacewear"

* Adds fn_loadout_setFacewear.sqf

This function will insert a given facewear item to a loadout array. The [7] position in loadout arrays specifies the equipped facewear, which is what this function modifies.

* Adds _fnc_setFacewear function

* Adds ability to equip facewear for rebel units

* Adds facewear to the FIA template

* Adds facewear to the AAF template

Specific to the AAF template, there are also comments with details on setting up facewear items for other templates, and how the weight system works.

* Removed facewear setup explanation comment

Instructed to move comment to FIA template file

* Added facewear setup explanation comment

Previously was in AAF template file, instructed to move it here

* Updated author, formatting fix (line 17)

* Moved facewear setup explanation comment to example templates

* Fixed wrong function being used to set facewear

* Removed documentation, weight setup being changed

* Simplified weight setup into template files. Changed facewear equip method for rebel loadout template.

* Fixed error with previous commit

* Removed facewear function in fn_equipRebel as it is now handled in the rebel faction's template

* Implemented rebel facewear setup changes to example file

* Replaced "!EMPTY" with blank string ""

* Facewear implementation to loadout verification

* Simplified facewear randomization into categories

* Simplified facewear examples

* Further example simplification

* Adjusted weights

* Update README.md

* Vn update for Unstable (official-antistasi-community#2415)

* Update fn_categoryOverrides.sqf

* Undo Accident

* Update fn_setPlaneLoadout.sqf

* Update Templates for Unstable

* Update VN_AI_PAVN.sqf

* Update VN_AI_PAVN.sqf

* added logging of debug code execution with name and UID (official-antistasi-community#2403)

* added logging of debug code execution with name and UID

* parameterised logging of debug console

* corrected typo

* corrected incorrect logic, resolved live update issues

* Hr events (official-antistasi-community#2254)

* initial event itteration (untested)

* corrected cfgFunctions and config

* fixed wrong argument passed to remoteExecCall

* added first event hook

* added new macros for detecting if an addon is loaded

* made events require registration before use,
throws warning otherwise

* - corrected incorrect overwrite check in addEvent listener
- added param sanity checking to modifying event functions
- fixed remove all events to not remove the event from the registry but clear it instead

* - moved to config defined events with params validation (disabled for now)
- simplified event trigger

* fixed broken events config.cpp

* added flag for event locality in config (for users sake)

* added headers

* typos

* added multiple new events

* removed case sensitivity for argument validation

* typos

* corrected errors with event triggers (official-antistasi-community#2423)

closes official-antistasi-community#2422
* added missing include in vehicleBoxHeal

* added missing include in buildHQ

* added missing inclue in civVEHInit

* moved fuinction call to addAction target instead of cursorObject

* solved possible null variable issue with triggerEvent call

* Revert "Stop god carry"

* Quality-of-life looting/logistics tweaks (official-antistasi-community#2418)

* Looting/logistics tweaks:
- Switch loot crate carrying from forceWalk true to allowSprint false
- Enabled buying loot crates from any rebel flag
- Fixed incorrect bounding box calc for load/unload
- Changed load/unload speed to be independent of script load

* Prevent killing people (including self) with loot crates

* Fix arsenal weapon switch duping magazines into arsenal since A3 2.07

* Enemy near changes (official-antistasi-community#2381)

* added parameter

* using the Parameter instead of constants

* needs to be an array

* review changes

* weird gitness

* garage enemyNearCheck changed

* review changes, removed getPos

* review changes, remove return

* review changes, remove 0

* review changes, combined enemiesEngaging and enemyNear

* added getPosATL to objects

* Fix rebel static mounting on DS (official-antistasi-community#2411)

* Fix rebel static mounting on DS

* Fixed stupid bug added while branch-swapping

* Template verification (official-antistasi-community#2439)

* turn off verification

* macro if

* Fix leftover setStartTime from official-antistasi-community#2439

Co-authored-by: Giddius <GordonGrossmann@gmx.at>
Co-authored-by: Peter <GitHub@Stather.me>
Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Co-authored-by: Lazejun <57111907+Lazejun@users.noreply.github.com>
Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>
Co-authored-by: HakonRydland <61709767+HakonRydland@users.noreply.github.com>
Co-authored-by: Théo Ackermann <38220718+zayfix@users.noreply.github.com>
Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Co-authored-by: dZ <92134872+UltimateFlash15@users.noreply.github.com>
Co-authored-by: Håkon <hrr1@hotmail.no>

* deleted duplicated entry

* fixed double speechmark breaking initZones

* fixes including official-antistasi-community#2451

* CLN and KS update

* Kunduz update

* Tembelan update

* whiteboard updates

* Cherno Autumn cover update

* Fixed Takistans broken antennas - tested

* Anizay slot order fix

* fix kunduz antennas

* Sahrani update

* Malden update & wrong picture fix

* cherno new antenna at outpost 9

* further cherno update

* Livonia update

* SOGPF whiteboard & logic update

* init switchcase improvement

* Tembelan update

* Khe Sanh cover and string update

* Altis moved support corridors

* another altis support corridor change

* Khe Sanh additions

* livonia - add control_2

Co-authored-by: Caleb Serafin <calebserafin@outlook.com>
Co-authored-by: jaj22 <jaj22x@gmail.com>
Co-authored-by: Giddius <GordonGrossmann@gmx.at>
Co-authored-by: Peter <GitHub@Stather.me>
Co-authored-by: Lazejun <57111907+Lazejun@users.noreply.github.com>
Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>
Co-authored-by: HakonRydland <61709767+HakonRydland@users.noreply.github.com>
Co-authored-by: Théo Ackermann <38220718+zayfix@users.noreply.github.com>
Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Co-authored-by: dZ <92134872+UltimateFlash15@users.noreply.github.com>
Co-authored-by: Håkon <hrr1@hotmail.no>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Added to changelog Added to changelog Enhancement New feature or request Ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants