Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 0fa26929396decf7b48ae2da73a5a2362d9ada7f
Author: Play3rgg <daniel.j.hult@gmail.com>
Date:   Mon Dec 9 16:36:30 2024 +0200

    Unstable

    adds bags to unstable rebel templates

commit 105d9646d374bd879a7b232a50aa73c2152f4b13
Merge: 70853fdb9 f96493297
Author: Play3rgg <daniel.j.hult@gmail.com>
Date:   Mon Dec 9 16:30:39 2024 +0200

    Merge branch 'TFARbags' into TFARbags_correct_real_and_true

commit 70853fdb94196af2456ed53a088bfae404484b35
Merge: 4243022ac d2efe6703
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Dec 6 22:32:26 2024 +0100

    Merge pull request #3455 from jaj22/fix-distance-player-disconnect

    Bugfix and optimizations to spawner selection

commit 4243022accab4ee100c825ef2cf8d50daace311d
Merge: 84d531200 ba3489d95
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Dec 6 22:31:56 2024 +0100

    Merge pull request #3452 from ante185/LDF-Rangers

    3CB Ranger update, artillery fix

commit 84d5312004cf81d7659e51d619d448e7b94859fc
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Fri Dec 6 22:31:25 2024 +0100

    CUP template fixes in BAF, ION (#3451)

    * Update CUP_AI_BAF_Temperate.sqf

    * Update CUP_AI_ION_Arctic.sqf

commit 06f29925b0d3f10fab7d3d5b6d26d1910b6f53d1
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Fri Dec 6 22:31:05 2024 +0100

    Isla duala enemy location cull (#3448)

    * Update initServer.sqf

    * Update mission.sqm

commit 2a62eb6027cbc00832035108472a6dd129ba090c
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Fri Dec 6 22:29:57 2024 +0100

    Fixed wrong owner check in fn_addBombRun.sqf (#3446)

    * Update fn_addBombRun.sqf

    * Update fn_addBombRun.sqf

commit edcdbf9cab3b60f527f0ebefd720149acc6d7e36
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Fri Dec 6 22:29:24 2024 +0100

    Ef detect as additional DLC (#3443)

    * Update fn_initVarServer.sqf

    * Update fn_setupMonitor.sqf

commit 7b5dbe394f6ac1fa4fb4891624519ea242a35e91
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Fri Dec 6 22:29:10 2024 +0100

    Ifa update (#3437)

    * intel fix

    * more M2 carbines, moved vehicles

    * Update IFA_AI_ALLIES.sqf

commit 9fcf3f030216f3390ff9a67dbbdbd5041de9de68
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Fri Dec 6 22:28:56 2024 +0100

    3CBF weapon integration into RHS factions (#3422)

    * 3CB weapon integration

    * Update RHS_AI_TLA.sqf

    * fixed oddities

commit e9777481a8c3afab0e86bd2dc97e329ce57f9b76
Author: jaj22 <jaj22x@gmail.com>
Date:   Fri Dec 6 21:28:36 2024 +0000

    Add UI and supporting code to set custom loadouts for rebel troops (#3392)

    * Add UI and supporting code to set custom loadouts for rebel troops

    * Fix recruit-spam bug

commit d2efe6703933d3109e20895ce42b4c788ac0600f
Author: John Jordan <jaj22x@gmail.com>
Date:   Thu Dec 5 03:09:22 2024 +0000

    Bugfix and optimizations to spawning function:
    - Remove effectiveCommander optimization for rebels to prevent issues when drivers disconnect.
    - Optimize performance for simpleVM (3-4x speedup on enemies).
    - Remove some unnecessary conditions for rebels (isKindOf is fast).

commit ba3489d951ba33f3c0a8e2afa4cfb153610e78a4
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Tue Dec 3 00:19:30 2024 +0100

    Update 3CB_AI_LDF.sqf

commit 8c9bb2f3968d6638516d59330b33ae709cbadad6
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Nov 27 21:25:48 2024 +0100

    Expeditionary Forces Vanilla and Western Sahara compatibility  (#3442)

    * Migrated commits

    * Update config.cpp

    * Update Vanilla_AI_AAF.sqf

commit 50049003db1c0233c5e483b88bff9bff1f242dcb
Merge: 1ef964e2d 3e59ecae7
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Wed Nov 27 21:25:00 2024 +0100

    Merge pull request #3441 from official-antistasi-community/EF-MJTF

    Expeditionary Forces MJTF factions

commit 1ef964e2d36cd91e615d442bf9d53c0fd9959f33
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Nov 27 21:22:29 2024 +0100

    Cwr3 post-test adjustments (#3429)

    * bike replaced, cop shotgun ammo provided

    * Update CWR_Reb_FIA.sqf

commit 4b881a7eb8febb429a5d63cfa813942786aa1745
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Nov 27 21:13:28 2024 +0100

    Carpet bombing turned into triple airstrike (#3430)

    * init

    * Update fn_SUP_carpetBombs.sqf

    * Update fn_initSupports.sqf

    * wiggled target location a little

commit a9902751cf3eb27b2b3050d896095a430dea6c79
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Nov 27 21:12:09 2024 +0100

    Isla Duala hide "bad" object update (#3424)

    * adjusted objective locations

    * Added bad object filter

    * renabled isladuala3

    * Update mission.sqm

    * moved hide script out of SQM

    * Update mission.sqm

    * Update mission.sqm

commit df856c77670f902d20f22fe187ffb2f943f56671
Merge: 7700ce233 1d1fcdcf4
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Wed Nov 27 21:10:23 2024 +0100

    Merge pull request #3436 from ante185/tiny-fix

    Fix debug line in fn_setPlaneLoadout.sqf

commit 7700ce23354f3fe4ec0ad0b6b3503575cdb0edb1
Author: Play3rgg <39414270+Play3rgg@users.noreply.github.com>
Date:   Wed Nov 27 22:09:47 2024 +0200

    SPEX Templates (#3428)

    * Initial SPEX Commit

    * Update fn_setupFactionsTab.sqf

    * Trailing commas

commit d6e5146800b085b2389f3edf7206593a6d117574
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Nov 27 21:08:50 2024 +0100

    WS Kamaz Texture Fix (#3416)

    * Update ws_ion.hpp

    * Update CfgVehicles.hpp

    * Update ws_ion.hpp

commit e29fd44c830e4594761f47296c045e2668f738dd
Author: Rein <mathiasrennebod12345@gmail.com>
Date:   Wed Nov 27 21:08:29 2024 +0100

    Aegis factions Compatability (#3414)

    * Basic AegisAtlas Templates Ported

    BUG: Rebel factions broken

    * Spelling mistakes, factions, parameters

    Fixed spelling mistakes.
    Added templates for Bundeswehr, Belarus, Argana, Takistania army.
    Added parameter for Western Sahara DLC.

    * template vt7

    forgot to add this in last commit.

    * Rest of BLUFOR factions

    * LogNodes, spelling mistakes

    * Minor spelling mistakes

    * Edits to hopefully fix merge conflict

    * Update Templates.hpp

    Random comment

    * Trying to fix conflicts

    * Again

    * Revert "Again"

    This reverts commit 3c161517c2bcebf6cd9c36185682e5485a397999.

    * And again

    * Update Templates.hpp

    * Identity + minor vars updated

    Updating every file to have identities, slHat, sniHats, slRifles

    * Aegis eq update

    Equipment update (Still needs WS check)
    Removed Atlas factions (temporarily)

    * WS compat

    * Vic attributes, templates.hpp

    * BAF voice fix

    Now its only british voices

    * AT swaparounds, No UKvoices in the US

    * ws check + US SCAR + LDF AK

    Accidentally put AA40 check in marksman dlc.
    Added SCARs to US for more variety than MX.
    Added AKs to LDF militia, cus former soviet country :D

    * Officer + AAF

    Officer template overhaul on all factions.
    AAF now has M4s, SF got SR25.

    * Outdated DLC checks

    AAF & CIV had outdated DLC checks.
    Added missing DLC stuff to REB factions.

    * Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_BAF_Arid.sqf

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_China.sqf

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_LDF.sqf

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_US_Arid.sqf

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * The rest replaced to C130

    * Spelling mistakes + minor edits

    Lots of spelling mistake errors in RPT (Thanks Ante!!).
    OPFOR T140 variants added as _vehiclesHeavyTanks.
    Russia SF now has Raven helmets.
    Rebels had minor Atlas items leftover.
    (Hopefully) fixed police and officer sharing same template.

    * militia EOD + Engi losing primary

    * BAF + Officer Classnames

    * aircraft loadouts + western weaponry

    config.cpp created with CAS & CAP loadouts.
    AAF, BAF, US & LDF got slightly changed or a minor overhaul for more new weapons.

    * Update config.cpp

    Removed unnecessary setups

    * Minor errors + CfgWeapons

    * RF compat

    * classname errors + officers spawning with shotgun

    * black mk20

    * Tweaks & fixes + Traitor edits

    - BAF tropical SF had mtp uniforms.
    - BAF non SF gets SPAR instead of MXM.
    - BAF & US tropical were missing RF compat.
    - China had wrong SF vests & uniforms.
    - Rebels, Shotgun only >:)
    - All traitor loadouts edited to look a tiny bit more traitorous.
    - All militias tweaked.

    * Config fixes + CSAT outfits

    - Config fixes for APCs/IFVs (SLATs).
    - Ammo bandolier :)
    - China, Iran & Russia got military and sf outfits swapped around, fits better.

    * missing s in reb + stuff not needed on AAF

    * Update ifv.hpp

    * Update Aegis_AI_US_Arid.sqf

    ---------

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

commit 3e59ecae7f839c6bf67d1d785a2807238f374785
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Wed Nov 27 18:06:09 2024 +0100

    Migrated MJTF

commit 1d1fcdcf4e287f1efe3eb7e664e0d6bbb45bc909
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sat Nov 23 03:02:03 2024 +0100

    Update fn_setPlaneLoadout.sqf

commit 579d43417f648d3da527b38368cf6d5f9191eb47
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Thu Nov 21 10:51:54 2024 -0500

    Helicopter Config Loadouts (#3423)

    * added helicopter loadout support

    * Update fn_setPlaneLoadout.sqf

commit f415b3036d45c873fab1c4f82413bb28bfcd9acd
Merge: 343c1a3fc adccded8b
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Mon Oct 28 22:49:48 2024 +0100

    Merge pull request #3418 from jaj22/fix-arty-ranging-shot

    Fix precedence error in mortar/arty support routine

commit adccded8b5c19201c97dc4b67016dd66bed135df
Author: John Jordan <jaj22x@gmail.com>
Date:   Sat Oct 26 18:15:15 2024 +0100

    Fix precedence error in mortar/arty support routine

commit 343c1a3fcad4f611987c985b3a38bd7d46442bbd
Author: skillless402 <94030952+skillless402@users.noreply.github.com>
Date:   Tue Oct 22 17:04:44 2024 -0400

    Added CWR3 Templates (#3413)

    * Added CWR3

    added the mod cold war rearmed 3

    * fixes

    fixed the #includes in all the templates
    fixed the CFG fix being empty

    * Fix of fixes

    Renamed in template hpp

    * spring cleaning

    removed vic attributes that aren't needed

    * More fixes

    Fixes to reb vic att

    * More fixes

    Removed unneeded comments fixed path for reb vic attributes and fixed prices

    * ante requested changes

    fixes ante asked for

    * template clean up

    cleaned up the same guns put over and over having the same loadout.
    and removed drones from the template

    * vic fixes

    Removed brdms and bmphq from apc line

    * extra"

    removed exrea " in apc line

    * more fixes

    added f4e because ante asked and removed a fat fingered 7

    * plane fixes

    fixed cas plane loadouts

    * Plane loadout fix

    fixed plane loadout

    * us plane fixes

    fixes

    * CAS Fix

    * Lore blurbs

    ---------

    Co-authored-by: ante <49555217+ante185@users.noreply.github.com>

commit f3aed1e3fc74c74c3a77d5ab63bc4d57fda4c271
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Tue Oct 22 23:04:04 2024 +0200

    Vanilla/WS Factions update, fine tuning, officer loadouts, further RF integration on missed factions (#3407)

    * WS

    * officer loadouts

    * RF UK/ION Update

    * validation error clearup

    * moved NLAW to lightAT

    * some extra MX and Katibas

    * Update Vanilla_AI_NATO_Temperate.sqf

    * officer uniform fix

commit 5f6b8524353ff29f9b03bc428042c1bb1feaedc8
Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Tue Oct 22 22:03:38 2024 +0100

    Seat drawing dev function (#3401)

    * drawSeats function for logi simplification

    * Update header, index handling, comments

    * Convert globals to constants

commit 28f717959ce2b3554a43ca46b619a0dd8656567f
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Oct 8 22:40:49 2024 +0200

    Update publishBranchToSteam.yml

commit ee233e26203ed262234482b75b26459123c27aab
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Oct 8 22:37:27 2024 +0200

    Update UpdateDevBuild.yml

commit cbc189be10574d87b2d193e41379f6c6e6071ac5
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Oct 8 22:32:11 2024 +0200

    Update publishBranchToSteam.yml

    upload-artifact & download-artifact version update

commit 0a37c521319357a957badb7b469a3a7d7161ab32
Merge: 26c5199dc dedfae4db
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Oct 8 22:25:58 2024 +0200

    Merge pull request #3409 from jaj22/fix-CBA-disposable-missile

    Fix CUP disposable missile launchers breaking init after CBA 3.18 update

commit dedfae4db39aa2f474448e88451ae857025b167e
Author: John Jordan <jaj22x@gmail.com>
Date:   Tue Oct 8 19:04:08 2024 +0100

    Fix CUP disposable missile launchers breaking init after CBA 3.18 update

commit 26c5199dc8e72dca173ef9bcddca422656b46876
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sun Sep 29 14:35:34 2024 -0400

    Injector success and UID logging (#3389)

    * Update fn_initACE.sqf

    * add painkillers to watchlist

commit c964a3c166348eb304d7529811290a4ec3cc1e86
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sun Sep 29 20:34:35 2024 +0200

    Fix base class for srifle_GM6_snake_lxWS  (#3406)

    * Update CfgWeapons.hpp

    * Update CfgWeapons.hpp

    * Update CfgWeapons.hpp

commit 2618d8097f096f4f205abab3defdae6967acbee4
Merge: a518d8b01 af12ee204
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Sep 29 20:34:23 2024 +0200

    Merge pull request #3402 from jaj22/fix-vn-melee-classification

    Prevent rebels AIs being equipped with VN melee weapons

commit a518d8b01bfad8fb971b7a47a8a9eaf8201cf6fc
Merge: 151c65c51 3cdb9c775
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Sep 29 20:34:15 2024 +0200

    Merge pull request #3397 from ILikeRubberDuckies/arsenal-clear-client-id-on-disconnect

    Fix arsenal not clearing client IDs on disconnect

commit 151c65c51af9874114a69a610c2cce39e38fe179
Merge: 6aa195e62 1d0c574cf
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Sep 29 20:34:05 2024 +0200

    Merge pull request #3395 from ILikeRubberDuckies/Tags-fix

    Fix errors caused by tags function

commit 6aa195e62289d69103263de50c8f139085476231
Merge: 0dc09d41b 5b05dc624
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Sep 29 20:33:47 2024 +0200

    Merge pull request #3393 from ILikeRubberDuckies/skill-upgrade-tooltip-fix

    Fix skill upgrade tooltip not updating

commit 0dc09d41b552e8b11abfea0b3260da5b70326dba
Author: Duckies <53313746+ILikeRubberDuckies@users.noreply.github.com>
Date:   Sun Sep 29 20:33:33 2024 +0200

    Fix HQ actions being available through remote controls (#3390)

    * Fix HQ actions being available through remote controls

    * Make HQ actions inaccessible for personal AI as well

    * Make mission requests inaccessible through remote controls

    * Block "transfer vehicle cargo to ammobox" action for UAVs

commit 92ff7948ee204afe3987e2ae599a106cafeff684
Author: jaj22 <jaj22x@gmail.com>
Date:   Sun Sep 29 19:33:22 2024 +0100

    Implement mortar/artillery support ranging shot and walking barrage (#3388)

    * Implement mortar/artillery support ranging shot and walking barrage

    * Artillery support tweaks:
    - Reduced change of using area supports when aggro is low.
    - Mortars & artillery may take two ranging shots at longer distances.
    - Fixed marker timeout.

commit 10dfbe9658be66d137fef0561f28a196cfc224cf
Author: jaj22 <jaj22x@gmail.com>
Date:   Sun Sep 29 19:32:35 2024 +0100

    Flatten out support responses and block support calls for mine kills (#3386)

    * Flatten out support response ramp and block support calls for mine/charge kills

    * Improve enemy threat calc and limit max spend based on proportion of rebel force committed

commit 8c9907308e8240ffbe450960f59764d4d3d64ff1
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sun Sep 29 20:32:13 2024 +0200

    More frequent militia vehicles/transports early game (#3376)

    * Increased low tier militia probability

    * Update fn_getVehiclesGroundSupport.sqf

    * Update fn_getVehiclesGroundSupport.sqf

commit 4588484ba1bb7016234b2f04daa35014180280d1
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sun Sep 29 20:31:59 2024 +0200

    Adds 3CB CSAT Scimitar, Gryphon, Bear, and Viper regiment (#3182)

    * concept

    * Removed ghost faction

    * uniforms for CSAT PERS

    * Update 3CB_AI_CSAT_Per.sqf

    * AT & items for CSAT

    * Belarusian CSAT Camos

    * Update 3CB_AI_CSAT_Per.sqf

    * Update 3CB_AI_CSAT_Bru.sqf

    * 3CB CSAT Vehicle & PE Camo variations

    * CH finalized loadouts

    * Fr started loadouts

    * SF uniforms & Helmets

    * SF Helmets, SL SF uniforms

    * Last guns Afr

    * Update 3CB_AI_CSAT_Chi.sqf

    * Names

    * less militia sights

    * guns guns guns (AKs)

    * sf woodland vests

    * SF Vests

    * CSAT BRU weapons fin

    * Error/Validation corrections

    * Brown Hex militia vehicles

    * removed MT-LB

    * Update fn_setPlaneLoadout.sqf

    * added more BTR 80A

    * Update 3CB_AI_CSAT_Fre.sqf

    * default maps

    * Updated 3CB Plane Loadouts

    * replaced militia G3's, Added more MP5Ks

commit af12ee20408647b55f771554c651095a93252d43
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Sep 6 16:48:34 2024 +0100

    Prevent rebels AIs being equipped with VN melee weapons

commit 3cdb9c7750db5f0da178c509ba267c894c319b12
Author: ILikeRubberDuckies <53313746+ILikeRubberDuckies@users.noreply.github.com>
Date:   Sat Aug 31 21:06:54 2024 +0200

    Fix arsenal not clearing client IDs on disconnect

commit 1d0c574cf49281bf701d19f285f9362c74b23ca1
Author: ILikeRubberDuckies <53313746+ILikeRubberDuckies@users.noreply.github.com>
Date:   Fri Aug 30 19:51:40 2024 +0200

    Fix errors caused by tags function

commit 5b05dc624241439f3c1fab8f9fa984c409670d83
Author: ILikeRubberDuckies <53313746+ILikeRubberDuckies@users.noreply.github.com>
Date:   Thu Aug 29 21:02:34 2024 +0200

    Fix skill upgrade tooltip not updating

commit 0d3a7dce7b965d0d16eaf0e9a60e209af3805412
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 18 23:29:44 2024 +0200

    3.7 changelog and version (#3380)

    * changelog and version

    * fixes

    * update

    ---------

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

commit f115593eb8288b2c06d65a2e33070cfbf0de73ff
Merge: 3e8375284 e243b1a21
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 18 23:27:05 2024 +0200

    Merge pull request #3381 from jaj22/fix-CBA-EH-again

    Fix SoldierGB inheritance chain for CBA XEH. Probably.

commit e243b1a21697638daf99016be3b5045be76c8f91
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Aug 18 22:04:33 2024 +0100

    Fix SoldierGB inheritance chain for CBA XEH. Probably.

commit 3e8375284c19fddfcd58b3a3b2626a286817c744
Merge: 873cf27a0 41829274d
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 18 21:48:44 2024 +0200

    Merge pull request #3379 from ante185/Missing-;

    Missing semi colon in IFA_SOV lore line.

commit 41829274dd4786a2abada3237d25eb9f4d1a9459
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Aug 18 21:45:29 2024 +0200

    Update Templates.hpp

commit 873cf27a0df2cb51f7813dd57f7f87b2b3f0ddb6
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sun Aug 18 21:14:46 2024 +0200

    SPE flashlight fix (#3377)

    * flashlights for everyone (not you)

    * Event handler patch

    * Update CfgVehicles.hpp

    * Commentry

commit b8697d064696120db70ff0e6cfc25830476905de
Merge: a3f5909b0 85a24e13d
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 18 21:09:18 2024 +0200

    Merge pull request #3375 from jaj22/remove-GETOUT

    Replace all uses of GETOUT waypoints

commit 85a24e13dbad4311577dd9efaafbebbe5866f36f
Author: John Jordan <jaj22x@gmail.com>
Date:   Tue Aug 13 03:12:17 2024 +0100

    Replace all uses of GETOUT waypoints

commit a3f5909b07208465f7ea7d3e62b0ba4be5590b20
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Mon Aug 12 20:44:40 2024 +0200

    SPE Rebel template tuned, enemy template adapted for #3370 (#3373)

    * Update SPE_IFA_REB_FFF.sqf

    * Update SPE_IFA_AI_WEH.sqf

    * Update SPE_IFA_AI_US.sqf

    * Update SPE_IFA_REB_FFF.sqf

commit 1299f5f23cc943e7024822248a5b5b5ea1b616b3
Merge: df66a0eb7 3af72aa38
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Mon Aug 12 20:41:46 2024 +0200

    Merge pull request #3370 from jaj22/add-attributeMoreTrucks

    Add attributeMoreTrucks and IFV-only option to ground transport selection

commit df66a0eb77e461067e2291d632f02d9e6dd391c7
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Mon Aug 12 14:40:56 2024 -0400

    Skip time improvements (#3320)

    * initial commit (untested)

    * restructure (READY)

commit 1a685aee0461ed9ce526ec374d80ae18693b32c7
Merge: 54cee95b3 fca626888
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 11 22:37:02 2024 +0200

    Merge pull request #3372 from jaj22/nerf-divebomb-vs-infantry

    Make dive bomb runs less accurate against infantry targets

commit 54cee95b36b2cc681d33071eb462a3b26d92dde4
Merge: e408e57c1 409b5d4c9
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 11 22:36:34 2024 +0200

    Merge pull request #3368 from jaj22/fix-rebuildAssets

    Fix inability to rebuild non-outpost radio towers

commit e408e57c13387836a5f2708e0e3b625960a2a027
Author: jaj22 <jaj22x@gmail.com>
Date:   Sun Aug 11 21:36:17 2024 +0100

    Create new classes for Antistasi AI units, block those from group join (#3349)

    * Create new classes for Antistasi AI units, block those from group join

    * Add Antistasi unarmed unit class

commit 4bf6003cbfb612567dea347d8cd07e65411f38d6
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 11 22:12:04 2024 +0200

    Spearhead 1944 1.1 - Mortain Map Port (#3371)

    * Mortain Commit

    * Normandy sqm fix

    * Fixes

    * airport_4 fix

    * outp_5-_12-_15 adjustment

    ---------

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

commit 4ab967618e60ca0dac6a59edd5de48b57f9924db
Merge: 600dd100f 70ff20ba6
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 11 22:03:42 2024 +0200

    Merge pull request #3365 from Tiny-DM/min-sell-price

    Very small sell price rework

commit 600dd100f2d11644ae9e2e0b69f06ba9dbc9fdb8
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sun Aug 11 16:00:27 2024 -0400

    SPE_IFA 1.1 Template Updates (#3356)

    * initial commit (WORKING)

    * Militia, Police update, vehicle reshuffle

    * CIV update

    * Update SPE_Vehicle_Attributes.sqf

    * RP, Vehicle, Starting equipment update

    * Identities

    * Update SPE_Vehicle_Attributes.sqf

    * Update SPE_IFA_REB_FFF.sqf

    * Update SPE_IFA_AI_WEH.sqf

    * Update SPE_IFA_AI_US.sqf

    * Update SPE_Vehicle_Attributes.sqf

    * simplified militia equipment

    ---------

    Co-authored-by: ante <49555217+ante185@users.noreply.github.com>

commit fca6268887f1e9fd9e29671bd9ebf86e8e0ba5b4
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Aug 11 01:06:41 2024 +0100

    Make dive bomb runs less accurate against infantry targets

commit da117f17b94f775acd8302c0182df230bf2b7623
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Aug 10 19:28:53 2024 -0400

    Seaport Ammobox Protection (#3369)

    * ammoboxes break undercover when grabbed

    * small fixes

commit da486be536ab564c06841fdca6cd81464adfd25f
Author: jaj22 <jaj22x@gmail.com>
Date:   Sun Aug 11 00:28:16 2024 +0100

    Fix support crew being provided for free and then refunded (#3367)

    * Fix support crew being provided for free and then refunded

    * Fix wrong group var name in UAV for when it's reactivated

commit 7137bacb324c15f5b5f945a5f92cca0bd69b8e34
Merge: 3f842e309 525054c67
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 11 01:27:30 2024 +0200

    Merge pull request #3364 from jaj22/fix-CDLC-unix-detection

    Workaround Arma bug with CDLC detection and arma3.cfg mod loading method

commit 3f842e3091845f770c08a3edc410939908ba3603
Merge: 739d3b5e3 072f316ae
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Aug 11 01:26:44 2024 +0200

    Merge pull request #3363 from Tiny-DM/remove-cluster-mlrs

    Remove CUP Cluster MLRS

commit 739d3b5e326aa9f46ea094334596af63927d36d0
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Aug 10 19:26:18 2024 -0400

    Disallow sling-loading HQ objects (#3362)

    * Update fn_initClient.sqf

    * moved to initserver

commit 26f1bc792b22b5f8afdef8aa91f68a3fe87e6a23
Author: jaj22 <jaj22x@gmail.com>
Date:   Sun Aug 11 00:25:54 2024 +0100

    Fix issue where running destroyCity with CUP interiors could crash (#3359)

    * Fix issue where running destroyCity with CUP interiors could crash

    * Fix aesthetic command casing

commit 3af72aa38f5c882c472a4a42858f6734548235c2
Author: John Jordan <jaj22x@gmail.com>
Date:   Sat Aug 10 21:55:43 2024 +0100

    Add attributeMoreTrucks and option for no APC or LAPC to ground transport selection

commit 366e14a7d388389320ee962357aab18632ebe5ea
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Aug 10 07:57:01 2024 +0200

    Default Arsenal Magazine Limits (#3337)

    * Update fn_arsenal_init.sqf

    * Update fn_arsenalLimitsDialog.sqf

    * Update fn_arsenal_init.sqf

commit 409b5d4c9734a6418898e8a39b7f0c8e2de7bb87
Author: John Jordan <jaj22x@gmail.com>
Date:   Sat Aug 10 02:43:37 2024 +0100

    Fix inability to rebuild non-outpost radio towers

commit 525054c673fc55fc3554845008a786599ef7920a
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Aug 9 23:38:21 2024 +0100

    Workaround Arma bug with CDLC detection and arma3.cfg mod loading method

commit d9babbf4a5a70c43ec48ee81177b25e8ac3cb396
Merge: 31ea5e23d 3777855b1
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Aug 9 21:59:21 2024 +0200

    Merge pull request #3361 from official-antistasi-community/tolgee-update-1723232579

    Updated Stringtable files

commit 3777855b17b18f175067f2eac0a200c5d6a699e9
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Fri Aug 9 19:42:59 2024 +0000

    Automated Tolgee Update

commit 31ea5e23d6d6a0fb3111bac46ee7f1a225575709
Merge: c255588f3 98faa9a00
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Aug 9 21:37:19 2024 +0200

    Merge pull request #3343 from jaj22/fix-eternal-life

    Slow down self-revive timeout when downed

commit c255588f3b7099e85ddcd0aecfc3c78b2488eacb
Merge: b25e8489b 6c73bde8c
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Aug 9 21:36:26 2024 +0200

    Merge pull request #3338 from jaj22/fix-arsenalLimits-use-before-data

    Fix slow-server UI issue and incorrect licensing in arsenal limits

commit b25e8489b2b5e29e672d73a2ad024d37a9a5745b
Merge: 0a638b00e 647d6d35b
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Aug 9 21:36:14 2024 +0200

    Merge pull request #3335 from jaj22/improve-CUP-IFA-plane-AI-turn

    Improve CUP and IFA plane turn rates when flown by AI

commit 0a638b00e85ae6080e972bdda5b5f73b29746ae7
Merge: 53cd15ac9 745197e14
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Fri Aug 9 21:35:43 2024 +0200

    Merge pull request #3327 from jaj22/reduce-artillery-ratio

    Reduce artillery/mortar ratio at high war tiers

commit 70ff20ba6ebe690bc2b4e641c4700ce2f87ac202
Author: Tiny-DM <ianfeickert2@gmail.com>
Date:   Fri Aug 9 10:06:52 2024 -0400

    Update fn_getVehicleSellPrice.sqf

commit 072f316ae7339b1b807da119d4ff92d552f460ed
Author: Tiny-DM <ianfeickert2@gmail.com>
Date:   Fri Aug 9 09:56:14 2024 -0400

    remove CUP cluster MLRS

commit 98faa9a0093129fcd7c94dd88b4d6c690a6d7eda
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Jul 14 18:47:25 2024 +0100

    Slow down self-revive timeout when downed

commit 6c73bde8cf07320dc0ba595b21e0c4d59d827d16
Author: John Jordan <jaj22x@gmail.com>
Date:   Wed Jul 10 04:06:12 2024 +0100

    Fix incorrect licensing and slow-server UI issue in arsenal limits dialog

commit 53cd15ac9a2b2a7c855e920ca6a510221cce7870
Merge: 0bed86ba7 e11cf2e4d
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jul 6 13:15:13 2024 +0200

    Merge pull request #3333 from official-antistasi-community/GUI_header_update

    DoomMetal GUI Header and license adjustments

commit 0bed86ba7c017109c79d3b47c88e580ee6c50015
Author: Ellis Nielsen <thecakebecamethelie@yahoo.com>
Date:   Sat Jul 6 05:38:28 2024 -0500

    Added: A tooltip for the locktime (#3334)

    * INIT:

    * THE NIGHTMARES ARE OVER.

    * stringtable

    * Added: grammar to the comments

    * review changes

commit 647d6d35bf1ff2f354561aa635a61a123b6c7ebe
Author: John Jordan <jaj22x@gmail.com>
Date:   Thu Jul 4 04:05:07 2024 +0100

    Improve CUP and IFA plane turn rates when flown by AI

commit e11cf2e4d0f03bdcfffe9ed94502fb255d17e010
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Mon Jul 1 18:47:29 2024 +0200

    Header and license adjustments

commit fede1c29f30805ebd970fd8dc9b6c029140bbde1
Merge: a5a0de12a 7969b3c0e
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 21:59:24 2024 +0200

    Merge pull request #3330 from official-antistasi-community/tolgee-update-1719777517

    Updated Stringtable files

commit 7969b3c0e9e8bbdfa7aae05a1f6391c5877a30a9
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 19:58:37 2024 +0000

    Automated Tolgee Update

commit a5a0de12a8c3915f2229609a2fbc52a55897e494
Merge: b8ad31743 86735f563
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 21:57:37 2024 +0200

    Merge pull request #3329 from official-antistasi-community/tolgee-update-1719777240

    Updated Stringtable files

commit 86735f5639302190e0cfa4272a51e64f105f0ca4
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 19:54:00 2024 +0000

    Automated Tolgee Update

commit b8ad317437b19354fca113621ae1a92a83442420
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 21:52:39 2024 +0200

    version and preliminary changelog (#3276)

    * version and preliminary changelog

    * updated changelog

    * update

    * update

    * udpate

    * update

    * update

    * update

    * update

    * update

    * cleanup and links

    * fix

    * fixes

    ---------

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

commit 6b948f5f46199bc4e4482ac302c59db87fe4a2a1
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 21:36:41 2024 +0200

    Pulau pics (#3328)

    * new pics

    * capitalisation

    * fixes string issues

    ---------

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

commit e3f1d45cde7718946fb6e771877851d3f3fb45a5
Merge: a7e9e0b86 973b8b439
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 18:56:25 2024 +0200

    Merge pull request #3322 from jaj22/fix-conflicting-addon-airloadouts

    Fix conflicting addon messages from aircraft loadout configs

commit a7e9e0b860ab1dbda40acac1daf3e31600714310
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sun Jun 30 18:24:54 2024 +0200

    Update RHS T50 loadouts (#3321)

    * Update config.cpp

    * Update config.cpp

commit ce67ed48ed30dd26476b255abaa12174999b6f4a
Merge: 2e43b051a 57aa60836
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 30 18:24:26 2024 +0200

    Merge pull request #3326 from ante185/ifa-ace-compat

    Added IFA-ACE-Compat detonators

commit 745197e14234fe07647fa3a4d887a5967a3a5034
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Jun 30 03:53:44 2024 +0100

    Reduce artillery/mortar ratio at high war tiers

commit 57aa60836950a7f6305261b7cda93e78f88375e2
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Jun 30 02:52:40 2024 +0200

    added IFA compat detonators

commit 2e43b051ad0d65e2e4decc314aa221d34a3c51eb
Author: Caleb Serafin <calebserafin@outlook.com>
Date:   Sat Jun 29 20:57:04 2024 +0200

    Fixed script error in new BattleMenu. (#3325)

    * Fixed script error in new BattleMenu.

    * Fixed comment example for controlHC.

commit d16b47113774746f9d5c2291c5ae476fba9add05
Merge: 2d2290436 d353df6e2
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 29 20:22:41 2024 +0200

    Merge pull request #3319 from jaj22/air-support-cheap-planes

    Adjust air support response for cheap planes

commit 2d2290436cfd14f5ef40ea384f2a790ad4649465
Merge: cc76aafe5 75300805e
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 29 19:47:02 2024 +0200

    Merge pull request #3318 from ante185/TLA-NVG

    Update RHS_AI_TLA military NVGs

commit cc76aafe5f3581ca0e876b5857c66b9acb0e7ec9
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 29 19:45:55 2024 +0200

    Ifa aircraft price update & loadout tweak (#3317)

    * Aircraft Price Reduction

    * Aircraft Loadout adjustments

    * Update config.cpp

commit 07840bffab35011261ddba917b490222394a493b
Author: jaj22 <jaj22x@gmail.com>
Date:   Sat Jun 29 18:45:31 2024 +0100

    Buff IFA mortars closer to mk6 (#3315)

    * Buff IFA mortars closer to mk6. Fix a couple of config bugs

    * Switch IFA US/UK templates to 81mm mortar. Tweak rebel prices

    * Switched IFA AK template AA to flak 30

commit 99130ac9ad9d3661cac20750b11f3ba4cd63622d
Merge: beedaf51e 30fb1633c
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 29 19:34:43 2024 +0200

    Merge pull request #3308 from ante185/jeepsjeepsjeeps

    IFA Replaced police vehicle with something less civilian

commit 973b8b439df6bf6004d0c168d9157176a08a99ff
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Jun 28 03:56:32 2024 +0100

    Fix conflicting addon messages from aircraft loadout configs

commit d353df6e2ab22ca23a662809a8d69d024b3837b1
Author: John Jordan <jaj22x@gmail.com>
Date:   Thu Jun 27 18:24:16 2024 +0100

    Adjust air support response for cheap planes

commit 75300805e4040bcb98cec12cd6e5376894101964
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Thu Jun 27 14:26:12 2024 +0200

    Update RHS_AI_TLA.sqf

commit beedaf51e525a3a9aeb4f2dee2c823ebc2e99705
Merge: 5b540590e 9272e34ad
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 23 21:55:14 2024 +0200

    Merge pull request #3312 from Tiny-DM/vehicle-sell-ds-fix

    Fix for vehicle sell DS

commit 9272e34ad5c5a417d0ad3a013520df7d5410551c
Author: Tiny-DM <ianfeickert2@gmail.com>
Date:   Sun Jun 23 12:20:26 2024 -0400

    fixed selling statics

commit 5b540590e304725c7b4800403f9121396c1e86d5
Merge: 42844012a 2068c7d54
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 22 20:43:35 2024 +0200

    Merge pull request #3310 from official-antistasi-community/tolgee-update-1719081557

    Updated Stringtable files

commit 2068c7d544f8ec3e6a6691bea27f16dfa4301c17
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 22 18:39:17 2024 +0000

    Automated Tolgee Update

commit 42844012af11beec7156aefa9717ec6dcbf2e777
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Jun 22 12:04:28 2024 -0400

    3.6 Testing Fixes 1 (#3301)

    * initial commit (ready)

    * Update Stringtable.xml

commit db4b599df4938e2b7472366361a7f00ea3e4d0aa
Author: Tiny-DM <ianfeickert2@gmail.com>
Date:   Sat Jun 22 12:02:51 2024 -0400

    fixed ds vehicle sell bug

commit 30fb1633c044589d66d279cbbefab66912855406
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 22 17:55:12 2024 +0200

    Replaced police vehicle with something less civilian

commit 0701984548da3d4afa39c50533257c171d15ecae
Author: jaj22 <jaj22x@gmail.com>
Date:   Thu Jun 20 20:47:53 2024 +0100

    Fix move asset not working on Petros (#3300)

commit 99cde30f7a78ac98272476376fb64ffbba07be8e
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Thu Jun 20 21:42:28 2024 +0200

    updated IFA radio backpacks, AK headwear, Parachutes (#3304)

    * updated radio, AK headwear

    * Parachutes

commit 9b5cd01c2ab702c57573846dd85b0531af60e415
Merge: 568a4a760 6d801eedc
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Jun 18 23:08:22 2024 +0200

    Merge pull request #3295 from jaj22/add-extra-traits-to-commander

    Add explosiveSpecialist and UAVHacker traits to default commander slot

commit 568a4a760285077a66a9490c46286b5b02b01d06
Merge: 85e42db04 323e1a0f1
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Jun 18 22:56:54 2024 +0200

    Merge pull request #3297 from jaj22/speculative-fix-init-order

    Speculative init order fix

commit 85e42db045afcc42cb3bead980b55e83c6271742
Merge: af4921096 89669dd0e
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Jun 18 22:54:34 2024 +0200

    Merge pull request #3296 from jaj22/fix-donate-money

    Donate money fixes

commit af49210961e363b038bcb725f82109978c1907d7
Merge: 68200405e 1c973627c
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Jun 18 22:45:52 2024 +0200

    Merge pull request #3294 from jaj22/fix-arsenalLimits-sync

    Fetch current arsenal data before displaying the arsenal limits dialog

commit 68200405e1ad5d3ec6abfd7984b46383a264c8af
Merge: e1ff40a36 16f01d851
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Jun 18 22:43:40 2024 +0200

    Merge pull request #3293 from jaj22/fix-carryItem-scheduling

    Fix potential double-carry or double-drop errors under heavy script load

commit e1ff40a3667c933108db644e570e57f14711d6b2
Merge: 96bbb3224 e34ff7d9e
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Tue Jun 18 22:42:50 2024 +0200

    Merge pull request #3282 from jaj22/convert-to-squad

    Allow commanders to make custom HC squads

commit 323e1a0f17e0d9cb27dc7c74ebc04849ead3cade
Author: John Jordan <jaj22x@gmail.com>
Date:   Tue Jun 18 02:27:33 2024 +0100

    Speculative init order fix

commit 89669dd0e8e643c12c3f230d2b6f0bdfae1a0ef3
Author: John Jordan <jaj22x@gmail.com>
Date:   Mon Jun 17 03:05:44 2024 +0100

    Fix misplaced switch default and block players from sending money to HCs in new UI

commit 6d801eedc622fbfa1b58538057916f46b5ab6a51
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Jun 16 17:25:45 2024 +0100

    Add explosiveSpecialist and UAVHacker traits to default commander slot

commit 1c973627c756b73a91aaf914ceddfb5b5bee2f74
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Jun 16 17:22:16 2024 +0100

    Fetch current arsenal data before displaying the arsenal limits dialog

commit 16f01d851f9c11e838c1cca8031971fe2c0a2a81
Author: John Jordan <jaj22x@gmail.com>
Date:   Sun Jun 16 17:11:12 2024 +0100

    Fix potential double-carry or double-drop errors under heavy script load

commit 96bbb322456cd47f05776cc4befd6231b56ebb60
Merge: 373f2c2a1 2bd86c99d
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sun Jun 16 14:39:48 2024 +0200

    Merge pull request #3292 from ante185/pulau-hotfix

    Update Pulau mission.sqm, make blufor & indfor hostile

commit 373f2c2a11b4c043be76c022672f0c2659c83e3d
Author: OTKZuki <96876522+ZukiAimi@users.noreply.github.com>
Date:   Sun Jun 16 13:39:19 2024 +0100

    Updated CUP Garage Store (#3277)

    * Updated CUP_Reb_NAPA

    Added more CIV vehicles and one Static AT with custom price

    * Update A3A/addons/core/Templates/Templates/CUP/CUP_Reb_Vehicle_Attributes.sqf

    Co-authored-by: Play3rgg <39414270+Play3rgg@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/CUP/CUP_Reb_NAPA.sqf

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/CUP/CUP_Reb_Vehicle_Attributes.sqf

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update CUP_Reb_TKM.sqf

    * Updated Napa and TKM

    * Made the changes ante asked for

    ---------

    Co-authored-by: Play3rgg <39414270+Play3rgg@users.noreply.github.com>
    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

commit 2bd86c99dad2ffa105052925dab956ea9f9349ee
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 22:07:53 2024 +0200

    Update mission.sqm

commit 131573e9d15ca96811cecd8059ea1e5e90548d69
Merge: ab92d818c 863717cf1
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 15 19:51:33 2024 +0200

    Merge pull request #3291 from jaj22/fix-buy-vehicle-tagging

    Fix buy vehicle menu function tagging

commit ab92d818cf9b5636402610f9f0883ddda0df66d3
Merge: c58fb9735 ceff834a7
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 15 19:50:31 2024 +0200

    Merge pull request #3290 from ante185/ifa-attribute-standard

    Standardized IFA attribute location

commit c58fb973510b30fd9f7819800d7579bd9de4611f
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 19:49:50 2024 +0200

    Update sfp_air.hpp with eventHandler inheritance  (#3289)

    * Update sfp_air.hpp

    * Revert "Update sfp_air.hpp"

    This reverts commit d0dec2f108bd0614142b660864e62af9c1b695c4.

    * removed eventhandlers

commit 90a3967bbf3ab64543f268dabee974f392077311
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 19:48:50 2024 +0200

    Livonia SF update (#3278)

    * Update mission.sqm

    * sourceName="Antistasi_Enoch";

    sourceName="Antistasi-Livonia";
    ->
    sourceName="Antistasi_Enoch";

    * Revert "sourceName="Antistasi_Enoch";"

    This reverts commit 86dd2ffb3da9891316791232038eb408922dda47.

commit 863717cf1b780545f9420195e7655672cd0aa818
Author: John Jordan <jaj22x@gmail.com>
Date:   Sat Jun 15 17:46:47 2024 +0100

    Fix buy vehicle menu function tagging

commit ceff834a7a532468b1f6f95fe11714ca2c92a60a
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 18:03:55 2024 +0200

    Standardised attribute location

commit 7d5f85c23127ba5f74e898eca8605f812ec46275
Merge: a1bcecf5a af620b73a
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 15 17:21:55 2024 +0200

    Merge pull request #3288 from jaj22/fix-destroy-vehicle-typo

    Fix mistype in DES_Vehicle

commit a1bcecf5abf5c3b72929708cbbd98590eced124b
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 17:18:13 2024 +0200

    Map Port of Pulau (#3214)

    * initial commit

    * Update NavGrid.hpp

    * Update mapInfo.hpp

    * Update mapInfo.hpp

    * Update mission.sqm

    * Update mission.sqm

    * formatting

    * Update mapInfo.hpp

    * Update mission.sqm

    * removed disabled towns from population

    * Update mission.sqm

    * Stringtable stuff

    * Update mission.sqm

    * reinforced airbase

    * Update mission.sqm

    * marked pics as placeholder and adapted texts

    ---------

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

commit 11bd70f496a123fa969007dbb904a42aa7a17658
Merge: 5778cd071 27f60d5e0
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 15 17:02:37 2024 +0200

    Merge pull request #3287 from jaj22/block-SAM-WW2-factions

    Prevent SAM supports being used by WW2 factions

commit af620b73ad9d668f22391179438505bb52d7a3ba
Author: John Jordan <jaj22x@gmail.com>
Date:   Sat Jun 15 15:58:04 2024 +0100

    Fix mistype in DES_Vehicle

commit 5778cd071272629386991f4d48f0605c9ddbefef
Merge: db7f5413d 49afad1cd
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Sat Jun 15 16:47:36 2024 +0200

    Merge pull request #3286 from jaj22/fix-createAttackForceLand-params

    Fix inconsistent parameter bug with createAttackForceLand

commit db7f5413d5873de5e88b4a8fb66c1c4a7193c36d
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Jun 15 10:46:49 2024 -0400

    Pre3.6 setup gui fixes (#3285)

    * removed a stray file change

    * added membership logging

    * send updates to server instead of client

    * initial commit (READY)

commit 5d2879ee430a9b5924a24310ea1e26f3d145b1d9
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Jun 15 10:44:31 2024 -0400

    Temp membership logging (#3284)

    * added membership logging

    * send updates to server instead of client

commit aa3d0f9e6c2b0cbc8565b97baf413cb15dd5a183
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Jun 15 10:42:06 2024 -0400

    Artillery marker improvements (#3260)

    * green mortar markers + enemy arty markers

    * Update A3A/addons/core/functions/Supports/fn_SUP_airstrikeRoutine.sqf

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

    * reverted variable reload timer

    * fixes 24.6.8

    * Update fn_artySupport.sqf

    * update 2024.6.12

    ---------

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

commit 4892fabbaf9a9d4aa965c65c8c8d21cd0278e11d
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 16:40:41 2024 +0200

    Iron Front AiO templates (#3166)

    * IFA Markers & Flags

    * IFA Rebels

    * IFA Civilians

    * Create IFA_AI_WEH.sqf

    * Create IFA_AI_SOV.sqf

    * IFA US, UK, & Combined

    * Create IFA_Vehicle_Attributes.sqf

    * Update Templates.hpp

    * rebel car adjustments

    * flags & boats

    * Update IFA_REB_FFI.sqf

    * "attributeLowAir", true

    * IFA logistics

    * Radios (To match SPE)

    * Update IFA_AI_UK.sqf

    * tanker kit adjustment

    * Updated seats blocked by logi

    * Update fn_categoryOverrides.sqf

    * Update fn_setPlaneLoadout.sqf

    * FlaK 38 instead of FlaK 30

    38 has a higher rate of fire - a reward for stealing them compared to the slower firing 30 that the FFI can buy

    * added more IFA plane exceptions

    * added extra mod support

    * Update IFA_CIV_Common.sqf

    * Update IFA_AI_ALLIES.sqf

    * updated weapon class names

    * started config stuff

    * Update config.cpp

    * funny full autos

    * Update CfgVehicles.hpp

    * rebel updates

    * Recoil and mode switch sound update

    * giggle switched guns

    * APC and costs adjustment

    * Revert ""attributeLowAir", true"

    This reverts commit 52a180f0a8a8852a27f9d529345c3687f4f570f2.

    * Update IFA_AI_WEH.sqf

    * CAS adjustments

    * blacklist for IFA transport air

    Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>

    * misc

    * updated US. UK templates

    gave SOV functional arty, added some extra equipment to allies, AK, and FFI

    * PaK 40's for everyone

    * Removed DAK pz4

    * Update config.cpp

    * Update CfgVehicles.hpp

    * removed fake statics, retextured Pz4, willys, reused HMG

    * removed comment

    * updated templates

    * template adjustments

    * Config fixed 1918 BAR Attachements

    * config fix for BAR part 2

    * template adjustments

    * tweaked cov LAT & 'AA'

    * Update IFA_AI_SOV.sqf

    * Update IFA_AI_SOV.sqf

    * Marksmen rifle with special ammo

    * reweighted some tanks

    * fixed diveParams, updated diveParams

    * Removed ineffective artillery

    * Avoid putting IFA fake magazines in the arsenal

    * AT cleanup

    * Update IFA_Vehicle_Attributes.sqf

    No Sam Attribute

    ---------

    Co-authored-by: Ellis Nielsen <thecakebecamethelie@yahoo.com>
    Co-authored-by: John Jordan <jaj22x@gmail.com>

commit a5bddb34cd778e560d5fd229817e561e754851e9
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Sat Jun 15 16:39:14 2024 +0200

    SFP templates (#2800)

    * Created files, filled in vics

    * Snow uniform, police loadouts

    * SF camo faces

    * Update Templates.hpp

    * complemented with CUP

    * Changed support trucks

    * 1st draft of loadouts

    * Modern template + modern snow template draft

    * Early temprate and winter template draft

    * Rifle smoke grenades

    * Cleanup

    * error fixing - status: testable

    * AT for early templates

    * adjusted vests of early templates, added flashlights to shotguns

    * Modern vests updated

    * helmets, AT backpacks

    * backpacks

    * Update Templates.hpp

    * error fix

    * renamed SvAF to SDF

    * More snow camo'd rifles

    * Changed to american english, gave more discounts

    * Replaced SFP turrets & sidearms with CUP

    * setup

    * cargo nodes step 1

    * Updated blocked seats

    * replaced mortar

    * JAS 39 Aircraft loadouts

    * fixed tank lineup

    * Vehicle adjustments

    * moved light tank to light tank

    * update 23/11/17

    New hats, new MP, m/45 and M/45b swapped places, new helicopters

    * ammountion diversity ish

    * Update SFP_AI_SWE_early_snow.sqf

    * Update SFP_AI_SWE_early.sqf

    * Update SFP_AI_SWE_early_snow.sqf

    * Update SFP_AI_SWE.sqf

    * Update SFP_AI_SWE_early.sqf

    * Update SFP_AI_SWE_early_snow.sqf

    * Update SFP_AI_SWE_snow.sqf

    * Update fn_setPlaneLoadout.sqf

    * Update fn_setPlaneLoadout.sqf

    * Update SFP_AI_SWE_snow.sqf

    * Update SFP_AI_SWE_snow.sqf

    * Update SFP_AI_SWE_early_snow.sqf

    * Update SFP_AI_SWE_early.sqf

    * Update SFP_AI_SWE.sqf

    * police backpacks be gone

    * rocket JAS, Bk90 for invaders

    * Update SFP_AI_SWE.sqf

    * Update SFP_AI_SWE_early.sqf

    * Update SFP_AI_SWE_early_snow.sqf

    * Update SFP_AI_SWE_snow.sqf

    * fix + slimmed loadouts

    * no more AA backpacks

    * replacements for militia truck and MG static

    * Helicopter adjustment

    * Names

    * killed some logi nodes

    * Update SFP_AI_SWE.sqf

    * formatting, dropped AH1

    * Migrated plane loadouts

    * Tweaked air assets

commit 27f60d5e045e30f7e3a826ea565049e07629ec9f
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Jun 14 19:26:17 2024 +0100

    Prevent SAM supports being used by WW2 factions

commit 49afad1cd9e2dc5c85a5abbd7fe5237d0cdc4c5c
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Jun 14 02:02:57 2024 +0100

    Fix inconsistent parameter bug with createAttackForceLand

commit f5884f0685442730c4c4a171b9afb9cb738a94f2
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Jun 12 20:39:06 2024 +0200

    RHS Tanoan Liberation Army (TLA) (#3267)

    * Create RHS_AI_TLA.sqf

    * Update Templates.hpp

    * Update RHS_AI_TLA.sqf

    * Update RHS_Reb_NAPA.sqf

    * Update Templates.hpp

    * Update RHS_AI_TLA.sqf

    * TLA retextured rocket hips

    * Update RHS_AI_TLA.sqf

    * Update RHS_AI_TLA.sqf

    * Update RHS_AI_TLA.sqf

    * Update RHS_AI_TLA.sqf

    ---------

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

commit 5316f5586893cd6ea455951c09a89e04be0cf46b
Merge: cba4f4e40 88cf85750
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Wed Jun 12 20:25:10 2024 +0200

    Merge pull request #3283 from jaj22/fix-diveParams-config

    Fix incorrect config array specifier for diveParams

commit cba4f4e4008c5f538bf2c6173b4e28ece5a239a5
Merge: 1a51f89c7 7615670c6
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Wed Jun 12 20:24:14 2024 +0200

    Merge pull request #3281 from ante185/3cb-wep-config-fixes

    3CB Factions baseWeapon config fix

commit 1a51f89c7d346d401e5f572fa6189b7cf655ecf9
Merge: bdc5c49a7 8ceec2bb4
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Wed Jun 12 20:23:05 2024 +0200

    Merge pull request #3274 from jaj22/add-tank-platoon-support

    Add tank platoon support as alternative to CAS

commit bdc5c49a73731ad20c904f5b6788357a35bbea6f
Merge: a30bad593 231ccb010
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
Date:   Wed Jun 12 20:21:27 2024 +0200

    Merge pull request #3273 from jaj22/fix-concurrent-attacks

    Prevent concurrent major attacks, and add a planning cost

commit a30bad593f8d2776f50c49968bf868a65fef8358
Author: Play3rgg <39414270+Play3rgg@users.noreply.github.com>
Date:   Wed Jun 12 21:19:34 2024 +0300

    RHS VDV Templates (#3271)

    * Create RHS_AI_VDV_Temperate.sqf

    * Update RHS_AI_VDV_Temperate.sqf

    * Update Templates.hpp

    * Change Militia Marksman' scope

    Changes the vanilla KAHLES Helia to a Mk. 4 which has lower magnification and is a generic sniper scope

    * Update A3A/addons/core/Templates/Templates/RHS/RHS_AI_VDV_Temperate.sqf

    ight bet

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/RHS/RHS_AI_VDV_Temperate.sqf

    ight bet

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * Update A3A/addons/core/Templates/Templates/RHS/RHS_AI_VDV_Temperate.sqf

    sounds good since its militia

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

    * UAZ Police, KORD only

    * Adds a Arid template

    * Heli changes 1, arid changes

    will need more work it seems..

    * Comments

    * MSV -> VDV variants and more

    MSV variants to -> VDV variants
    Notes on Arid template
    Arid scope fix
    Heli changes (again)

    * Binoculars, Amphibious VMF-> VDV

    * Carbine, SMG changes

    Scorpion, PP20000 moved around

    * APCs moved around etc.

    APCs, IFVs, LightTanks, Artillery and LightAttack changes

    * More -2k

    * -2m

    * empty IFV

    * Update RHS_AI_VDV_Arid.sqf

    * Updated addon logo

    thanks ante

    * Update RHS_AI_VDV_Temperate.sqf

    * Update RHS_AI_VDV_Arid.sqf

    * "Fixed" Wrong case on Forward moutned RMR

    | Antistasi | Error | File: A3A_fnc_TV_verifyLoadoutsData | \x\A3A\addons\core\Templates\Templates\RHS\RHS_AI_VDV_Arid.sqf Loadout validation failed for loadouts:
    military_AA:
    Bad case on classname: rhsusf_acc_rm05_fwd, expected: rhsusf_acc_RM05_fwd

    military_ExplosivesExpert:
    Bad case on classname: rhsusf_acc_rm05_fwd, expected: rhsusf_acc_RM05_fwd

    Fixed

    * Validation error fixes

    Muzzle device in Rail

    * Bad case Validation

    ---------

    Co-authored-by: ante185 <49555217+ante185@users.noreply.github.com>

commit e81b82c04ee537e9579338dfb09033b052cf878d
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Wed Jun 12 14:18:09 2024 -0400

    Setup GUI Factions Info (#3269)

    * initial commit (mostly ready)

    * updates shortnames and descriptions 1

    * update 24.6.7

    * separatist development team

    * code optimizations and string fix

commit 8093702eac30ced9036eb6d5b1569cc44ce5e8ff
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Wed Jun 12 14:14:49 2024 -0400

    Destroy Heli mission fixes (#3256)

    * initial commit (ready)

    * added slingload functionality

commit 9471ce8351dd1bc64fd1ba9b6152bd1161ab8451
Author: jaj22 <jaj22x@gmail.com>
Date:   Wed Jun 12 19:13:45 2024 +0100

    Convert corpse/wreck timed cleanup into a server queue with max cap (#3255)

    * Convert corpse/wreck timed cleanup into a server queue with max cap

    * Tab to space fixes in postmortemLoop

commit 67379142d1e74450f8e54bc6cff2704ae12b10b9
Author: Caleb Serafin <calebserafin@outlook.com>
Date:   Wed Jun 12 20:12:33 2024 +0200

    Added GUI prefix and Experimental Battle Menu (#3229)

    * Refactored GUI addon to use A3A_GUI and FUNC(name)

    * Corrected issues with stringed macros.

    * Fast travel place holders. Menu opens fast travel.

    * 💰 Added donation functionality.

    * Donate and Admin mostly functional. FT needs work.

    * Migrated SetupGUI to use A3A_GUI prefix.

    * Fixed Message syntax.

    * Re-added buyVehicleDialog after deletion

    * Fixed GUI_ prefix and fast travel time formatting variables.

    * removed plural from FT and fixed current money formatting.

    * Fixed hide top bar anddonate money,
    Added new battle menu to normal y-menu button.

    * Corrent _this refference.

    * Removed other language entries in modified string table keys.

    * Revert "Removed other language entries in modified string table keys."

    This reverts commit d2a38f25b6e4941eb162184872e7d3d8836d253d.

    * Reverted string table key wipe

    * Fixed hinting during canGoUndrecover. and disabled Go Overt.

    * Update A3A/addons/core/functions/Dialogs/fn_HQGameOptions.sqf

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

    * Update A3A/addons/core/functions/Dialogs/fn_fastTravelRadio.sqf

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

    * Added is Admin functions.

    * Changed timespan formatting print zero signigicant amounts rather than show smaller denomications.

    * Fixed donate money player list generation.

    * Fixed isAdmin check to use new functions for admin tab.

    * Update A3A/addons/core/functions/Time/fn_timeSpan_format.sqf

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

    * Fixed non-existant variable in sendMoney.

    * Removed the silly server side check since arma 3 is based on the cream cheese security model anyway.

    * Fixed HQGameOptgions not woirking with civ limit.
    Hid options for AI limit in new menu.

    * Removed fast travel async.

    * Limitetd asset teleport distance to 50m of HQ.

    * Removed isClientOrServer

    * Fixed backwards compatibility and error reporting in resourcesPlayer and sendMoney.

    * Fixed semicolon.

    * simplified future calculateFastTravel cost calculation

    * Removed annoying mapscale debug line.

    * Added unit tests as documentation for timeSpan_format. timeSpan_format accepts seconds.

    * Made FUNC() consistent. Fixed script errors in hQDialog.

    * Put New battle menu and HQ dialogue behind a paramter setting "Use In-Development UI Preview"

    * Commented out addAction for Experimental HQ Management

    * Fixed handling of groups or players passed to canFastTravel or calculate cost.

    ---------

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

commit 4b48a99a322e484e0cde6132680717c0bd140b4a
Author: ante185 <49555217+ante185@users.noreply.github.com>
Date:   Wed Jun 12 20:10:02 2024 +0200

    RHS HIDF Template (#3209)

    * Update config.cpp

    * fixes M3A1 Grease Gun's lack of >30m fire modes

    * Create RHS_AI_HIDF.sqf

    * Update Templates.hpp

    * Update RHS_AI_HIDF.sqf

    * Update RHS_AI_HIDF.sqf

    * Update RHS_AI_HIDF.sqf

    * adjustments and cleanup

    * preemptive vehiclesAirPatrol

    * Update RHS_AI_HIDF.sqf

    * Update RHS_AI_HIDF.sqf

    * Updated flag texture and marker

    * Update RHS_AI_HIDF.sqf

    * Dropped attack helicopter

    * Update RHS_AI_HIDF.sqf

    * Update RHS_AI_HIDF.sqf

    * Update RHS_Vehicle_Attributes.sqf

    * Replaced modern trucks with old trucks

    * repainted some M113s and a M2A2 to olive green

commit 88cf857507ea700bd1c25a0bc9462b57416b14e7
Author: John Jordan <jaj22x@gmail.com>
Date:   Wed Jun 12 03:45:57 2024 +0100

    Fix incorrect config array specifier for diveParams

commit e34ff7d9ebb21d5d6a7b79d353fc62ce29ecdab9
Author: John Jordan <jaj22x@gmail.com>
Date:   Mon Jun 10 20:36:27 2024 +0100

    Add ability for commander to convert player-squad units into a custom high command squad

commit 7615670c6c3e4c0628494f93a0099a0442c414d2
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Mon Jun 10 19:55:00 2024 +0200

    config fixed

    resolved baseWeapon error of
    UK3CB_MG3_KWS_T
    UK3CB_M21_Bipod_Railed
    uk3cb_auga2_sr_carb_tan

commit 8ceec2bb44ecdd1d85013633d62d76d26065c5ee
Author: John Jordan <jaj22x@gmail.com>
Date:   Sat Jun 8 15:58:32 2024 +0100

    Add tank platoon support as alternative to CAS

commit 12369e4d77995761026d19b87134479cef505844
Author: jaj22 <jaj22x@gmail.com>
Date:   Sat Jun 8 11:14:54 2024 +0100

    Improve getArtilleryRanges, fix IFA mortar case (#3266)

    * Changes to getArtilleryRanges:
    - Improve artillery turret detection.
    - Search fire modes properly in case the maximum charge size isn't 1.
    - Remove incorrect attempt at determining minimum range.

    * Accurately replicate artillery computer min/max ranges in getArtilleryRanges

commit ea2543925c1ed4c8ac9544f0ec62ffe19e56f466
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
Date:   Sat Jun 8 06:11:33 2024 -0400

    Remove restriction from AILoadInfo action (#3257)

    * initial commit (ready)

    * Update fn_initClient.sqf

commit 6d486969f351260075f886d782847186032e04e1
Author: jaj22 <jaj22x@gmail.com>
Date:   Sat Jun 8 11:10:38 2024 +0100

    Rework anti-air support response balance (#3250)

    * Rework anti-air support response balance

    * Fix airspace control threat locality issue

    * Add parameter for air response time, fixed airspceControl bug

    * Fix inverted low-air check for SAM usage frequency

    * Fix incorrect resource adjustment method and changed fixed-wing aircraft to not spawn except at taxi speeds

    * Add isTouchingGround to air spawning & leash checks

commit fb2bfba94211c2ae53ec73d02041bd5bfd6a0082
Author: jaj22 <jaj22x@gmail.com>
Date:   Sat Jun 8 11:09:05 2024 +0100

    Allow guests to use of arsenal limits dialog and set default guest limit to 0 (#3234)

    * Allow guest commanders limited use of arsenal limits dialog and set default guest limit to 0

    * Enable save and load of arsenal limits data

    * Port arsenal limits dialog to Antistasi GUI style, store member-set values

commit 231ccb010968ee607ee100267fd2580e2eeef9a0
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Jun 7 18:11:31 2024 +0100

    Prevent concurrent major attacks, and add a planning cost to reduce spamming of cheap attacks
  • Loading branch information
@Play3rgg
Play3rgg committed Dec 9, 2024
1 parent f964932 commit 4a28af9
Show file tree
Hide file tree
Showing 392 changed files with 137,824 additions and 19,357 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/UpdateDevBuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: '.\tools\Builder\buildAddons.ps1 -WorkshopID ${{github.event.inputs.workshopid}} -modFileName mod_dev.cpp'

- name: Upload build addon artifact
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: A3A
path: build\A3A
Expand All @@ -38,7 +38,7 @@ jobs:
needs: [build]
steps:
- name: Download addon artifact
uses: actions/download-artifact@v3.0.2
uses: actions/download-artifact@v4
with:
name: A3A
path: A3A
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publishBranchToSteam.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
timeout-minutes: 5
steps:
- name: Checkout the code
uses: actions/checkout@v2
uses: actions/checkout@v3.3.0

- name: Increment version locally
run: chmod +x ./tools/incrementVersion.js &&
Expand All @@ -20,7 +20,7 @@ jobs:
run: '.\tools\Builder\buildAddons.ps1 -WorkshopID ${{secrets.WORKSHOPID}}'

- name: Upload build addon artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: A3A
path: build\A3A
Expand All @@ -31,13 +31,13 @@ jobs:
needs: [build]
steps:
- name: Download addon artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: A3A
path: A3A

- name: Publish to Steam Workshop
uses: arma-actions/workshop-upload@v1
uses: arma-actions/workshop-upload@v1.0.2
with:
appId: '107410' # default
itemId: ${{ secrets.WORKSHOPID }} # https://steamcommunity.com/sharedfiles/filedetails/?id=[...]]
Expand Down
13 changes: 13 additions & 0 deletions A3A/addons/config_fixes/3CB/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,18 @@ class CfgWeapons
magazineWell[] = {"CBA_792x57_K98"};
recoil = "recoil_dmr_01";
};

class UK3CB_MG3;
class UK3CB_MG3_KWS_T : UK3CB_MG3{
BaseWeapon = "UK3CB_MG3_KWS_T";
};
class UK3CB_M21;
class UK3CB_M21_Bipod_Railed : UK3CB_M21{
BaseWeapon = "UK3CB_M21_Bipod_Railed";
};
class uk3cb_auga2_sr_carb;
class uk3cb_auga2_sr_carb_tan : uk3cb_auga2_sr_carb{
BaseWeapon = "uk3cb_auga2_sr_carb_tan";
};
};

3 changes: 2 additions & 1 deletion A3A/addons/config_fixes/3CB/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ class CfgPatches
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV"};
requiredAddons[] = {"A3_Data_F_AoW_Loadorder","UK3CB_Factions_Vehicles_SUV",
"UK3CB_Factions_Weapons_AUG","UK3CB_Factions_Weapons_M14","UK3CB_Factions_Weapons_MG3"};
author = AUTHOR;
authors[] = { AUTHORS };
authorUrl = "";
Expand Down
10 changes: 10 additions & 0 deletions A3A/addons/config_fixes/Aegis/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//Aegis - CfgVehicles.hpp

class CfgVehicles
{
//#include "air.hpp"
//#include "armor.hpp"
#include "ifv.hpp"
//#include "sea.hpp"
//#include "soft.hpp"
};
10 changes: 10 additions & 0 deletions A3A/addons/config_fixes/Aegis/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//Aegis - CfgWeapons.hpp

class CfgWeapons
{
class Aegis_arifle_AKM74_F;
class Aegis_arifle_AKM74_sand_F : Aegis_arifle_AKM74_F
{
baseWeapon = "Aegis_arifle_AKM74_sand_F";
};
};
25 changes: 25 additions & 0 deletions A3A/addons/config_fixes/Aegis/config.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//Aegis - config.cpp

#include "..\script_component.hpp"


class CfgPatches
{
class PATCHNAME(Aegis)
{
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"A3_Aegis_Weapons_F_Aegis_Rifles_AKM74", "A3_Aegis_Data_F_Aegis_Loadorder"};
author = AUTHOR;
authors[] = { AUTHORS };
authorUrl = "";
VERSION_CONFIG;
skipWhenMissingDependencies = 1;
};
};

// Uncomment when needed
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
170 changes: 170 additions & 0 deletions A3A/addons/config_fixes/Aegis/ifv.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
//Aegis - ifv.hpp

// Mora/Lancer/Odyniec //
class APC_Tracked_03_base_v2_F;
class I_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_I_APC_tracked_03_cannon_v2_F : I_APC_tracked_03_cannon_v2_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class I_E_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_I_E_APC_tracked_03_cannon_v2_F : I_E_APC_tracked_03_cannon_v2_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_A_APC_tracked_03_cannon_v2_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_B_A_APC_tracked_03_cannon_v2_F : B_A_APC_tracked_03_cannon_v2_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_A_APC_tracked_03_cannon_v2_wdl_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_B_A_APC_tracked_03_cannon_v2_wdl_F : B_A_APC_tracked_03_cannon_v2_wdl_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_A_APC_tracked_03_cannon_v2_tna_F : APC_Tracked_03_base_v2_F { class EventHandlers; };
class a3a_B_A_APC_tracked_03_cannon_v2_tna_F : B_A_APC_tracked_03_cannon_v2_tna_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Marshall/Borsuk //
class APC_Wheeled_01_base_v2_F;
class B_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_B_APC_Wheeled_01_cannon_v2_F : B_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_W_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_B_W_APC_Wheeled_01_cannon_v2_F : B_W_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_T_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_B_T_APC_Wheeled_01_cannon_v2_F : B_T_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class Aegis_I_E_APC_Wheeled_01_cannon_v2_F : APC_Wheeled_01_base_v2_F { class EventHandlers; };
class a3a_Aegis_I_E_APC_Wheeled_01_cannon_v2_F : Aegis_I_E_APC_Wheeled_01_cannon_v2_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Marid/Kazak //
class APC_Wheeled_02_base_v2_F;
class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_O_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_O_T_APC_Wheeled_02_rcws_v2_ghex_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_R_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_O_R_APC_Wheeled_02_rcws_v2_F : O_R_APC_Wheeled_02_rcws_v2_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Kamysh/Okhotnik //
class O_APC_Tracked_02_base_F;
class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F { class EventHandlers; };
class a3a_O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_T_APC_Tracked_02_cannon_ghex_F : O_APC_Tracked_02_base_F { class EventHandlers; };
class a3a_O_T_APC_Tracked_02_cannon_ghex_F : O_T_APC_Tracked_02_cannon_ghex_F
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class O_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_cannon_F {};
class Aegis_O_R_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS {};
class a3a_Aegis_O_R_APC_Tracked_02_30mm_lxWS : Aegis_O_R_APC_Tracked_02_30mm_lxWS
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

// Bogatyr //
class APC_Wheeled_04_base_F;
class O_R_APC_Wheeled_04_cannon_F : APC_Wheeled_04_base_F { class Turrets;};
class a3a_O_R_APC_Wheeled_04_cannon_base : O_R_APC_Wheeled_04_cannon_F { scope = 0; class EventHandlers; class Turrets : Turrets { class MainTurret; }; };
class a3a_O_R_APC_Wheeled_04_cannon_F : a3a_O_R_APC_Wheeled_04_cannon_base
{
scope = 2;
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
class Turrets : Turrets
{
class MainTurret : MainTurret
{
magazines[] = {"140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Green","2000Rnd_762x51_Belt_Green","4rnd_Vorona_HEAT","4rnd_Vorona_HE"};
weapons[] = {"autocannon_30mm_CTWS","LMG_coax_ext","missiles_Vorona_vehicle"};
};
};
};
38 changes: 38 additions & 0 deletions A3A/addons/config_fixes/CUP/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//Vanilla - CfgVehicles.hpp

class CfgVehicles
{
#include "sfp_air.hpp"

// Nose-fall tweaks to make planes turn at a semi-decent rate when flown by AI
class Plane_Base_F;
class CUP_A10_Base : Plane_Base_F
{
draconicTorqueXCoef = 2;
};
class CUP_L39_base : Plane_base_F
{
draconicTorqueXCoef = 2;
};

// The faster planes benefit slightly from more torque, so we use the array form
class Plane;
class CUP_AV8B_Base : Plane
{
draconicTorqueXCoef[] = {2,3,4,5,6,7,8,9,10,10.1,10.2};
};
class CUP_Su25_base : Plane
{
draconicTorqueXCoef[] = {2,3,4,5,6,7,8,9,10,10.1,10.2};
//speeds in m/s: {0, 37.5, 75, 112.5, 150, 187.5, 225, 262.5, 300, 337.5, 375m/s}
};
class CUP_F35B_base : Plane
{
draconicTorqueXCoef[] = {2,3.5,5,6.5,8,9,10,11,12,12.1,12.2};
//speeds in m/s: {0, 58.3, 117, 175, 233, 292, 350, 408, 467, 525, 583m/s}
};
class CUP_SU34_BASE : Plane
{
draconicTorqueXCoef[] = {2,3.5,5,6.5,8,9,10,11,12,12.1,12.2};
};
};
7 changes: 2 additions & 5 deletions A3A/addons/config_fixes/CUP/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

#include "..\script_component.hpp"

#if __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")

class CfgPatches
{
class PATCHNAME(CUP)
Expand All @@ -16,13 +14,12 @@ class CfgPatches
author = AUTHOR;
authors[] = { AUTHORS };
authorUrl = "";
skipWhenMissingDependencies = 1;
VERSION_CONFIG;
};
};

// Uncomment when needed
//#include "CfgMagazines.hpp"
//#include "CfgVehicles.hpp"
#include "CfgVehicles.hpp"
//#include "CfgWeapons.hpp"

#endif // __has_include("\CUP\Vehicles\CUP_Vehicles_LoadOrder\config.bin")
24 changes: 24 additions & 0 deletions A3A/addons/config_fixes/CUP/sfp_air.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//CUP-SFP - sfp_air.hpp

class CUP_B_UH60S_USN;
class CUP_MH60S_Unarmed_USN;
class CUP_MH60S_Unarmed_FFV_USN;

class a3a_SFP_B_UH60S_USN : CUP_B_UH60S_USN
{
displayName = "UH-60M (M3M)";
textureList[] = {"Black", 1};
animationList[] = {"Navyclan_hide",1,"Navyclan2_hide",1,"Filters_Hide",1,"mainRotor_folded",1,"mainRotor_unfolded",0,"Hide_ESSS2x",1,"Hide_ESSS4x",1,"Hide_Nose",0,"Blackhawk_Hide",0,"Hide_FlirTurret",1,"Hide_Probe",1,"Doorcock_Hide",0};
};
class a3a_SFP_MH60S_Unarmed_USN : CUP_MH60S_Unarmed_USN
{
displayName = "UH-60M (Unarmed)";
textureList[] = {"Black", 1};
animationList[] = {"Navyclan_hide",1,"Navyclan2_hide",1,"Filters_Hide",1,"mainRotor_folded",1,"mainRotor_unfolded",0,"Hide_ESSS2x",1,"Hide_ESSS4x",1,"Hide_Nose",0,"Blackhawk_Hide",0,"Hide_FlirTurret",0,"Hide_Probe",1,"Doorcock_Hide",0};
};
class a3a_SFP_MH60S_Unarmed_FFV_USN : CUP_MH60S_Unarmed_FFV_USN
{
displayName = "UH-60M (Unarmed/FFV)";
textureList[] = {"Black", 1};
animationList[] = {"Navyclan_hide",1,"Navyclan2_hide",1,"Filters_Hide",1,"mainRotor_folded",1,"mainRotor_unfolded",0,"Hide_ESSS2x",1,"Hide_ESSS4x",1,"Hide_Nose",0,"Blackhawk_Hide",0,"Hide_FlirTurret",0,"Hide_Probe",1,"Doorcock_Hide",0};
};
Loading

0 comments on commit 4a28af9

Please sign in to comment.