Template optre #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
stutpip123
pushed a commit
that referenced
this pull request
Aug 8, 2023
SilenceIsFatto
pushed a commit
that referenced
this pull request
Apr 21, 2024
SilenceIsFatto
added a commit
that referenced
this pull request
Nov 7, 2024
SilenceIsFatto
added a commit
that referenced
this pull request
Dec 5, 2024
* port official-antistasi-community#3369 adopted to ultimate functions needs testing * port official-antistasi-community#3364 needs testing * port official-antistasi-community#3349 adopted to ultimate functions Needs heavy testing and probably some work to integrate rivals * port official-antistasi-community#3273 * port official-antistasi-community#3231 * port official-antistasi-community#3205 * port official-antistasi-community#3207 * unit traits changes * Fast travel enabled only between major locations * CUP Norwegian Armed Forces * Fixes/Flushing For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back. * JCA Arms Dealer * Project Infinite Arms Dealer * Naming Consistency * F-16C Price Update to Match Sheet * Vehicle Prices Match to Sheet * Naming Consistency * CUP HAFM Gives a RVMAT Error whenever the GD420 Spawns. But it's not a crashing error. * CUP FFP * Correcting Mistake * fixes * Fixing Mistake * Fixes and Additions * Add names function for templates * requiredAddons Fix * basic structure * leftover fix * M16 Addition * Start * Fixes * ChernarusRedux Initial Port * CUP NATO + BAF Fix CUP NATO BAF SF + BW Elite + US Army Military + Czech Militia * Vehicle Market - Use diminishing returns approach on HQ vehicle price * Vehicle Market - Use diminishing returns approach on black market vehicle price * more zones and stuff * Update mission.sqm * Update common.inc * Update fn_moveOutCrew.sqf * Update A3A/addons/core/functions/REINF/fn_postmortem.sqf Co-authored-by: Silence <[email protected]> * Update fn_compatibilityLoadFaction.sqf * Update fn_loadRivals.sqf * Update fn_initVarServer.sqf * changed some music and radio files * updated money item yield and make money spawn in random houses * volume and maxDistance * 3AS DC17M replace Legion * Update mission.sqm * Update mission.sqm * Add names (cup, rhs, vanilla), add functionality * Update mission.sqm * more audio files and changes * done * Create fn_RivalsCreateUnit.sqf * Update fn_itemset_medicalSupplies.sqf * SFP ZU-23 to CUP ZU-23 * bunch of fixes no driver issue fix tags error fix wind param fix vehicle don't fit in tent hangar "fix" duplicate string for ldf fix * fixes for fixes * add another outpost, clear more roads * Air vehicle access on milbases (#282) * air vehicle access on milbases (whaaaaaaaaa) whaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * Update CUP_AI_BAF_Temperate.sqf * Update CUP_AI_BAF_Arid.sqf * roll back * roll back --------- Co-authored-by: Silence <[email protected]> * Fast travel enabled only between major locations (#332) * CUP Norwegian Armed Forces (#335) * CUP Norwegian Armed Forces * Fixes/Flushing For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back. * F-16C Price Update to Match Sheet * Vehicle Prices Match to Sheet --------- Co-authored-by: stutpip123 <[email protected]> * economic victory needed amount fix / bug fixes (#339) * economic victory per map * hud warning weapon sway * updated to use correct values * Main menu update (#342) * base changes * bug fixes * added images * documentation * removed unused fnc * future proofing * Set naming/case consistency, quality consistency --------- Co-authored-by: SilenceIsFatto <[email protected]> Co-authored-by: stutpip123 <[email protected]> * Revert "Merge pull request #341 from Azodion/CUP_FFP" This reverts commit 9971e7b, reversing changes made to dcbc50f. * Reapply "Merge pull request #341 from Azodion/CUP_FFP" This reverts commit aabf384. * Update templates.hpp * Update cfgPlaneLoadouts.hpp * support new anomalies mod * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * Update Aegis_AI_CSAT_Temperate.sqf * Update Aegis_AI_NATO_Arid.sqf * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * Update WS_AI_NATO&UNA.sqf * Create fn_liberatedeserter.sqf * Update fn_destroyCity.sqf * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert Actually need to test this one, if good, uncomment * revert the revert @SilenceIsFatto * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * revert the revert * community ports official-antistasi-community#3388 and official-antistasi-community#3418 * community port official-antistasi-community#3397 * cleanup * Update fn_SUP_cruiseMissileAvailable.sqf * Fix helmet default unlocks (again) * 3AS Update add Gozanti Cruiser to WM Empire templates and arms dealer * Add missing variable * Missing semicolons fixed * Missing semicolons fixed * Missing semicolons fixed * Missing semicolons fixed * Missing semicolons fixed * Update fn_airspaceControl.sqf * Petros Ambient sounds * Revert "Merge branch 'ambient-sound-change' into unstable" This reverts commit 9bb7c70, reversing changes made to 1e94ef9. * delete _laser to avoid spam * delete pods untested * delete pods untested * Fix anomaly height/spawning * cleanup * cleanup * remove laggy bit * cleanup * Unmerge ambient sounds (#2) * Update script_version.hpp * compile gunships variable I dunno, probably required * Fix grass/view distance being set in main menu * Re-add addon entries and strings, update dealers * Update script_version.hpp v11.3.1 * DELETE THE F LASER * Fix Respawning on Redux * disable invinsiblity untested * Update A3A/addons/gui/CfgFunctions.hpp Co-authored-by: Silence <[email protected]> * Update Stringtable.xml * Expeditionary Forces arms dealer * Re-add removed entries * EAW Updates add new planes to template and dealer * EF support * EF part 1 * Add fallbacks for identity, convert to hashmap * part 2 next stop, weapons and gear * Add EF helicopters, change `py` to `python` * part 3 next stop, logistics * part 4 finished Next stop, QRFNaval? * part 4.1 Oups, almost forgot * Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf Co-authored-by: Silence <[email protected]> * fixes * Add initACE to CfgFunctions.hpp * fix * fix * fix * Remove CUP names, replace with vanilla * price adjustment for the support * Fix syntax errors, incorrect var declarations * 11.4 --------- Co-authored-by: wersal454 <[email protected]> Co-authored-by: Pvt.Unknown <[email protected]> Co-authored-by: Hophri <[email protected]> Co-authored-by: MaxxLite <[email protected]> Co-authored-by: stutpip123 <[email protected]> Co-authored-by: Bot <[email protected]> Co-authored-by: AtteKarppinen <[email protected]> Co-authored-by: Brenner650 <[email protected]> Co-authored-by: Antistasi Ultimate Community Bot <[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.
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: