Unstable merge #2
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
* 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 * removed excecive debug lines * corrected include paths * started use of directChildCtrls and mad cfgFunctions use the ADDON macro
Correct a Typo in CSAT Voices
Fix behaviour and remoteExec bugs in undercover AI
* Fix bad JIP marker colours and refactor * Missed a -Local
Disable Arma rating changes for players
Rework garage placement rotation
* 📝 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
…me_stringtable_fix fixed typo for sara mapname_short
Remove Petros's Face from Ai Faces
Change CUP A10 to A10 with real pylons
* 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 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 * parameterised logging of debug console * corrected typo * corrected incorrect logic, resolved live update issues
* 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
closes #2422 * added missing include in vehicleBoxHeal * added missing include in buildHQ * added missing inclue in civVEHInit
Stop god carry
…6-stopGodCarry Revert "Stop god carry"
solved possible null variable issue with triggerEvent call
* 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
* 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 * Fixed stupid bug added while branch-swapping
Fix arsenal weapon switch duping magazines
* turn off verification * macro if
Fix leftover setStartTime from #2439
Adds Logistic Nodes and Templates by @stutpip123, Added Helicopters as possible Logistic Vehicles (This needs to be done for the rest of the Templates at some point too). Added Unsungs Category Chaos to fn_categoryOverrides Mod Integration: Unsung (#2379) * Add files via upload * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update detector.sqf * Update selector.sqf * Update params.hpp * reduced number of CAS and AA planes * Update Unsung_AI_US_Tropical.sqf * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_Logistics_Nodes.sqf * Add Unsung AA Planes * Update params.hpp * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update Unsung_Reb_VC_Tropical.sqf * Update Unsung_Reb_VC_Tropical.sqf * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_Logistics_Nodes.sqf * Update Unsung_Logistics_Nodes.sqf * Update selector.sqf * Update Unsung_AI_US_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update fn_equipmentIsValidForCurrentModset.sqf * Update Templates.hpp * Renaming/Small changes to files to work * Update Categories for Unsung * Add Cas Loadouts * Add Helis as Possible Logistics vehicle * Update Templates.hpp * Add Identities, Casing etc. * Update fn_equipmentSort.sqf * Update fn_equipmentIsValidForCurrentModset.sqf * Update UNS_Civ.sqf * Update * Equipment Fun Co-authored-by: stutpip123 <[email protected]>
RetardedFoX
pushed a commit
that referenced
this pull request
Mar 19, 2024
* 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]>
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.
Selfexplanatory