Update Branch GM-Templates-Desert-Prep #3095
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* save names in faction config * set names for vanilla, RHS and CUP factions * add createRandomIdentity * setIdentityLocal receives hashMap * createUnit receives identity or sets random identity * fix calls setting identity * update setIdentity header * set default faces, voices and names for all factions * fix civilian identity in the punishment mission * Formatting fixes Co-authored-by: Jouni Järvinen <[email protected]> --------- Co-authored-by: Artyom Vasilyev <[email protected]> Co-authored-by: Lazejun <[email protected]> Co-authored-by: Jouni Järvinen <[email protected]>
* jeroen_arsenal_localization * Shortened names, added missing texts * Additional changes. --------- Co-authored-by: Bob-Murphy <[email protected]> Co-authored-by: Whiskeysim(Hazey) <[email protected]>
…ckForceAir Fix to allow AI use light helis in QRF
* initial commit * review changes * ace_throwable fix * Fixes & cleanup for ACE init refactor: - Removed surplus initACEUnconsciousHandler call. - Removed leftover debug systemChat from treatment logging. - Fixed bug in throwableThrown EH. - Moved claim calls before the early-out. - Moved initServer event handlers to correct place (pre-serverInitDone) --------- Co-authored-by: John Jordan <[email protected]>
* config patch ChDKZ tanks * Update RHS_AI_ChDKZ.sqf * added signifier "rhs" to class names * Update chdkz_rhs.hpp * Restructure config_fixes to work better with multiple modsets * Update RHS_AI_ChDKZ.sqf adjusted usage of sabatour carbines --------- Co-authored-by: John Jordan <[email protected]>
* Minor changes to garrisons * Minor changes and fixes * Fixed potential issue where no buildings are found * Added Filter for buildings that can contain statics * Converted to a more universal check method * Cleaned up to be more readable. * Removed redundant check. * Converted potentially spammy debug to trace. * These two back to debug. * Update A3A/addons/patcom/functions/Patcom/fn_patrolGroupGarrison.sqf Co-authored-by: Jouni Järvinen <[email protected]> --------- Co-authored-by: Jouni Järvinen <[email protected]>
* Added APEX dlc UAV * Added JETS dlc UAV * Added JETS dlc UAV Note* Noticed that Arid template has "B_UAV_02_dynamicLoadout_F" and others have "B_UAV_02_CAS_F" please check * Added JETS dlc UAV Note* Noticed that Nato Arid template have "B_UAV_02_dynamicLoadout_F" while others have "B_UAV_02_CAS_F" please check * Added JETS dlc UAV Note* Noticed that Nato Arid template have "B_UAV_02_dynamicLoadout_F" while others have "B_UAV_02_CAS_F" please check * Added Jets dlc UAV * Added JETS dlc UAV * Added JETS dlc UAV * Added JETS dlc UAV * Added JETS dlc UAV and transport planes
* Added CSAT transport plane * Added CSAT transport plane you can check existence of this variant here https://community.bistudio.com/wiki/Arma_3:_CfgVehicles_EAST#:~:text=O_T_VTOL_02_infantry_hex_F
* Fixed missing include * Addded FIX_LINE_NUMBERS
package name change
Fix mismatched lowercased a3a in some config_fixes files
…display-name-fix " rebells"-fix
Retextured RHS Mi8's to chdkz camo
Add member & guest lock limits to garage
* Add files via upload * Add files via upload * github action update * Update syncStringtables.yml * Update .gitignore --------- Co-authored-by: Bob-Murphy <[email protected]>
…ate-1694962567 Updated Stringtable files
…-patch-1-debug Update debug.hpp
…_HQ_V4_F Land_Cargo_HQ_V4_F addition
- Fixed a bug where players could have revive permanently disabled. - Changed downed damage lockout to 0.2 seconds rather than one frame. - Remove persistence of downed damage accumulator.
…ate-1700698141 Updated Stringtable files
* Kozlice 12G * removed allowDLCEnoch
* Update fn_AAFroadPatrol.sqf * Update fn_AAFroadPatrol.sqf * Update fn_AAFroadPatrol.sqf * Update fn_AAFroadPatrol.sqf
* Move bool param conversion to initServer so that it works for autoload & mismatched clients * Add support for expanding boolean parameters
Improve double-revive case
* Update WS_AI_SFIA.sqf * marker typo
Add log/notify only option to punishment system
* fix for abort capture + less capture timej _titleStr is a private variable, so the replacement should solve the header issue. 3 seconds have been taken off the time to more closely match the actual time for the animation to finish * increased time for capture * minor addition to PR
* Marksmen weapons fix * black bipods for relevant marksmen weapons
* params update * civ params update --------- Co-authored-by: Bob-Murphy <[email protected]>
* variety of fixes for AS missions * minor fix to stringtable * misc fixes * "offroad" to "parked vehicle"
Fix errors when there are no suitable buildings to garrison
Fix some real and theoretical revive issues
…ate-1700952126 Updated Stringtable files
* Update Vanilla_AI_CSAT_Apex.sqf * Update Vanilla_AI_NATO_Apex.sqf * Update Vanilla_AI_NATO_Apex.sqf * Update Vanilla_AI_NATO_Tropical.sqf
Corrected magazine for RHS 2S1 Artillery
* 3-4-1 changelog and version * changes * changes --------- Co-authored-by: Bob-Murphy <[email protected]>
* initial Kujari set up * sqm update --------- Co-authored-by: Bob-Murphy <[email protected]>
* Revert "Fix trailing comma and missing AA plane in ION Temperate" * created map * update * restart * sqm update * factories and resources nearly fin ? * Isla Duala * map update * Update mission.sqm * Update mission.sqm moved a factory, "signed posted" some player detection areas by outposts and airports * Finished loactions? disabled 3 towns * Update mission.sqm * removed excess seaports * New radio towers * Update mapInfo.hpp * fixed controls, moved radio tower * Update mission.sqm * Delete radio towers.bmp * temp images * reorg comments * Update mission.sqm * moved radio tower, reorged comments for new locations * Update mission.sqm * Update mission.sqm * Update mission.sqm * Update mission.sqm * Update mapInfo.hpp * new image, mission update * Update mission.sqm * Update mission.sqm * Update mission.sqm * Update mission.sqm * nav grid back up Created a backup of the navgrid in case the uncrossable bridges becomes crossable * Navgrid update * Revert "Fix trailing comma and missing AA plane in ION Temperate" * created map * update * restart * sqm update * factories and resources nearly fin ? * Isla Duala * map update * Update mission.sqm * Update mission.sqm moved a factory, "signed posted" some player detection areas by outposts and airports * Finished loactions? disabled 3 towns * Update mission.sqm * removed excess seaports * New radio towers * Update mapInfo.hpp * fixed controls, moved radio tower * Update mission.sqm * Delete radio towers.bmp * temp images * reorg comments * Update mission.sqm * moved radio tower, reorged comments for new locations * Update mission.sqm * Update mission.sqm * Update mission.sqm * Update mission.sqm * Update mapInfo.hpp * new image, mission update * Update mission.sqm * Update mission.sqm * Update mission.sqm * Update mission.sqm * nav grid back up Created a backup of the navgrid in case the uncrossable bridges becomes crossable * Revert "Revert "Fix trailing comma and missing AA plane in ION Temperate"" This reverts commit b343aff. * Update mission.sqm * Update navGrid.sqf * Update navGrid.sqf * Create config.cpp * Update config.cpp * Update mapInfo.hpp * Update mission.sqm * Update mapInfo.hpp * string & text corrections * map check and adjustments * Update mission.sqm * Bridge protection * sqm update * min civ count per location * Update mission.sqm * whiteboard * Revert "Revert "Fix trailing comma and missing AA plane in ION Temperate"" This reverts commit 60592ed. --------- Co-authored-by: Bob-Murphy <[email protected]> Co-authored-by: Bob-Murphy <[email protected]>
Move FF damage notifications into evaluateEvent
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this.
What have you changed and why?
Information:
Please specify which Issue this PR Resolves.
closes #XXXX
Please verify the following and ensure all checks are completed.
Is further testing or are further changes required?
How can the changes be tested?
Steps:
Notes: