Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix fallback code for militia lacking cargo trucks #3116

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Fix fallback code for militia lacking cargo trucks #3116

merged 1 commit into from
Jan 30, 2024

Conversation

jaj22
Copy link

@jaj22 jaj22 commented Jan 30, 2024

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

The code for spawning trucks at outposts/seaports/resources/factories was supposed to fallback to spawning a truck from vehiclesCargoTrucks if the list would otherwise lack cargo trucks, but the code was incorrect and did nothing. This PR fixes it.

The main difference is that factions are no longer requires to have cargo-capable trucks in the militia list.

Please specify which Issue this PR Resolves.

closes #3097

Please verify the following and ensure all checks are completed.

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

Is further testing or are further changes required?

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

Please test with a faction that doesn't have cargo vehicles in the militia list. Early game factory or resource should work.

@jaj22 jaj22 added Bug Something isn't working Info needed Further information is requested. labels Jan 30, 2024
@jaj22 jaj22 added this to the 3.5 milestone Jan 30, 2024
@jaj22 jaj22 requested a review from targetingsnake January 30, 2024 04:06
Bob-Murphy
Bob-Murphy approved these changes Jan 30, 2024
View reviewed changes
Copy link

@Bob-Murphy Bob-Murphy left a comment •
edited
Loading

Choose a reason for hiding this comment

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

lgtm
Confirmed via test by deleting I_C_Van_01_transport_F from vehiclesMilitiaTrucks array from vanilla AAF faction and loading it which spawned I_Truck_02_transport_F from vehiclesTrucks.

@Bob-Murphy Bob-Murphy added Ready for merge and removed Info needed Further information is requested. labels Jan 30, 2024
@Bob-Murphy Bob-Murphy merged commit a5aa69d into official-antistasi-community:unstable Jan 30, 2024
@Bob-Murphy Bob-Murphy added the Added to changelog Added to changelog label Feb 9, 2024
ante185 added a commit that referenced this pull request Mar 28, 2024
@ante185
Squashed commit of the following:
6a12134 
commit 530c74f
Merge: b04fa73 6a9361c
Author: ante <[email protected]>
Date:   Wed Mar 13 20:50:27 2024 +0100

    Merge branch 'unstable' into IFA-AIO

commit 6a9361c
Merge: 31609ef 2a2ffd8
Author: Bob-Murphy <[email protected]>
Date:   Sun Mar 3 14:41:31 2024 +0100

    Merge pull request #3163 from official-antistasi-community/tolgee-update-1709472690

    Updated Stringtable files

commit 2a2ffd8
Author: Bob-Murphy <[email protected]>
Date:   Sun Mar 3 13:31:30 2024 +0000

    Automated Tolgee Update

commit 31609ef
Merge: 46e9780 08f0ca0
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 18:40:06 2024 +0100

    Merge pull request #3156 from official-antistasi-community/3.5.1

    3.5.1 version and changelog

commit 46e9780
Merge: 927361f 6e9c0f1
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 18:36:11 2024 +0100

    Merge pull request #3157 from official-antistasi-community/tolgee-update-1708277554

    Updated Stringtable files

commit 6e9c0f1
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 17:32:34 2024 +0000

    Automated Tolgee Update

commit 08f0ca0
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 11:46:27 2024 +0100

    version and changelog

commit 927361f
Merge: 6517087 e709901
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 11:35:06 2024 +0100

    Merge pull request #3155 from official-antistasi-community/3119

    3119 - kujari map fixes

commit 6517087
Merge: bdfd7ed 08ea558
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:56:36 2024 +0100

    Merge pull request #3151 from jaj22/remove-artySupport-forcedspawn

    Disable forced marker spawn in artySupport

commit bdfd7ed
Merge: 5aeba0a f46ad2b
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:55:39 2024 +0100

    Merge pull request #3150 from jaj22/fix-LDF-rogue-var

    Fix rogue var breaking vanilla LDF template

commit 5aeba0a
Merge: 61e1c61 5adeb8d
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:55:02 2024 +0100

    Merge pull request #3147 from Tiny-DM/3.5.1-fixes

    3.5.1 Undercover and Defend fixes

commit e709901
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:52:10 2024 +0100

    3119 fixes

commit 08ea558
Author: John Jordan <[email protected]>
Date:   Fri Feb 16 21:18:19 2024 +0000

    Disable forced marker spawn in artySupport (rebel HC arty)

commit f46ad2b
Author: John Jordan <[email protected]>
Date:   Fri Feb 16 21:13:28 2024 +0000

    Fix rogue var breaking vanilla LDF template

commit 5adeb8d
Author: Tiny-DM <[email protected]>
Date:   Tue Feb 13 13:22:00 2024 -0500

    Initial Commit (UNTESTED)

commit 61e1c61
Merge: dae0828 f4f8049
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 21:09:38 2024 +0100

    Merge pull request #3144 from jaj22/fix-missing-actionRevive-localize

    Fix missing localize in actionRevive

commit dae0828
Merge: ef4cec3 b9f0ba7
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 21:09:26 2024 +0100

    Merge pull request #3143 from jaj22/fix-double-destroyCity

    Orbital strike already destroys the city naturally, don't do it twice

commit f4f8049
Author: John Jordan <[email protected]>
Date:   Sun Feb 11 19:52:10 2024 +0000

    Fix missing localize in actionRevive

commit b9f0ba7
Author: John Jordan <[email protected]>
Date:   Sun Feb 11 19:46:07 2024 +0000

    Orbital strike already destroys the city naturally, don't do it twice

commit ef4cec3
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 19:27:13 2024 +0100

    preliminary 3.5.0 changelog (#3135)

    * preliminary 3.5.0 changelog

    * adjustments based on tinys input

    * 3134 addition

    * 3137

    * 3131

    * 2802

    * typo fix

    * 3139

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 3864669
Merge: ea2c3cc a77fe5a
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 13:14:49 2024 +0100

    Merge pull request #3140 from official-antistasi-community/tolgee-update-1707653626

    Updated Stringtable files

commit a77fe5a
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 12:13:47 2024 +0000

    Automated Tolgee Update

commit ea2c3cc
Author: jaj22 <[email protected]>
Date:   Sun Feb 11 12:12:48 2024 +0000

    Make SLAT IFVs CBA-compatible (#3128)

    * Make SLAT IFVs CBA-compatible

    * Remove extra init EH if vehicle already has initVehicle in EH

    * Make WS IFVs CBA-compatible

commit 5d5c821
Author: Tiny-DM <[email protected]>
Date:   Sat Feb 10 17:32:12 2024 -0500

    Vehicle discounts with no seaports (#3137)

    * Update fn_vehiclePrice.sqf

    added additional conditions for vehicle pricing

    * add additional war level tiers to calc

commit a0c1714
Author: jaj22 <[email protected]>
Date:   Sat Feb 10 20:41:27 2024 +0000

    Cull large builder boxes because they don't work yet (#3139)

    The very large builder boxes don't fit in either width or weight for a lot of vehicles that they'll load into. Can be fixed later, but not in 3.5. Also the gameplay need for them is questionable: We probably don't want people building or repairing that much.

    Buffed the "large" box to 1500 as a placeholder.

commit 1df0da1
Author: targetingsnake <[email protected]>
Date:   Sat Feb 10 21:39:57 2024 +0100

    readded debug functions second time (#3131)

    * readed debug functions seccond time

    ---------

    Co-authored-by: targetingsnake <[email protected]>

commit 6540b7c
Merge: 8cbc8e7 b580a2d
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 12:39:53 2024 +0100

    Merge pull request #3138 from official-antistasi-community/tolgee-update-1707565006

    Updated Stringtable files

commit b580a2d
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 11:36:46 2024 +0000

    Automated Tolgee Update

commit 8cbc8e7
Merge: 1e03950 53e2985
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 11:20:46 2024 +0100

    Merge pull request #3134 from jaj22/add-construction-button-hint

    Add hint to help older players find the new construction system

commit 53e2985
Author: John Jordan <[email protected]>
Date:   Fri Feb 9 20:18:08 2024 +0000

    Add hint to help older players find the new construction system

commit 1e03950
Merge: 16fa821 b0b9e09
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 21:52:21 2024 +0100

    Merge pull request #3133 from official-antistasi-community/tolgee-update-1707425397

    Updated Stringtable files

commit b0b9e09
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 20:49:57 2024 +0000

    Automated Tolgee Update

commit 16fa821
Merge: d3ba88a 0bc0367
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 21:47:20 2024 +0100

    Merge pull request #3126 from jaj22/fix-airspaceControl-exploit

    Fix cases where airspaceControl wouldn't execute

commit d3ba88a
Author: Tiny-DM <[email protected]>
Date:   Thu Feb 8 15:46:37 2024 -0500

    Misc fixes batch 2 (#3110)

    * initial commit (UNTESTED)

    * second major commit (TESTED)

    * hotfix by John

    * Additional fixes, removed 2585

    * Stringtable update (why github)

    funny merge conflict

    * Update Stringtable.xml

    misc new line in stringtable, removed

    * fixed patrol arm routine

    * Minor updates (localization + john's comment)

commit f24ab7c
Author: targetingsnake <[email protected]>
Date:   Thu Feb 8 11:01:02 2024 +0100

    Fix Crashes on GM Desert Templates (#3120)

    * added function for Checking vehicles in templates

    * imporved vehicle script

    * fix for servers crashing on desert template

    * removed testcode

    ---------

    Co-authored-by: targetingsnake <[email protected]>

commit d6ab4ea
Merge: a174dbe 4afd496
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 08:47:59 2024 +0100

    Merge pull request #3129 from official-antistasi-community/tolgee-update-1707205400

    Updated Stringtable files

commit 4afd496
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 07:43:19 2024 +0000

    Automated Tolgee Update

commit a174dbe
Merge: 63e90d6 06ad9f6
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 08:42:08 2024 +0100

    Merge pull request #3123 from jaj22/fix-petros-placement-hintC

    Fix petros placement stringtable conversion bug

commit 0bc0367
Author: John Jordan <[email protected]>
Date:   Mon Feb 5 22:38:09 2024 +0000

    Fix cases where airspaceControl wouldn't execute despite a player flying an air vehicle

commit 06ad9f6
Author: John Jordan <[email protected]>
Date:   Sat Feb 3 04:55:23 2024 +0000

    Fix bogus array wrapper on hintC that prevented the petros placement UI from appearing

commit 63e90d6
Merge: 84121b4 c908f2e
Author: Bob-Murphy <[email protected]>
Date:   Wed Jan 31 10:01:26 2024 +0100

    Merge pull request #3118 from official-antistasi-community/tolgee-update-1706691491

    Updated Stringtable files

commit c908f2e
Author: Bob-Murphy <[email protected]>
Date:   Wed Jan 31 08:58:11 2024 +0000

    Automated Tolgee Update

commit 84121b4
Merge: 9fd39fb 15e4e41
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 23:29:14 2024 +0100

    Merge pull request #3114 from jaj22/fix-RC-spawning

    Fix remote-controlling players despawning rebel garrisons & civs

commit 9fd39fb
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:21:00 2024 +0100

    proper map pics and blurb fix (#3117)

    * proper map pics

    * blurb

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit a5aa69d
Merge: 02bb42c 367d91a
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:18:37 2024 +0100

    Merge pull request #3116 from jaj22/fix-cargoTrucks-fallback

    Fix fallback code for militia lacking cargo trucks

commit 02bb42c
Merge: bebc9de a1b41ee
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:18:28 2024 +0100

    Merge pull request #3115 from jaj22/log-rebel-airstrikes

    Add more logging for rebel and enemy airstrikes

commit bebc9de
Author: ante185 <[email protected]>
Date:   Tue Jan 30 15:18:16 2024 +0100

    Pistols for rebel AI - case (#3083)

    * Update fn_categoryOverrides.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_randomRifle.sqf

    * Update fn_randomRifle.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_categoryOverrides.sqf

    * Update fn_randomRifle.sqf

    * Update A3A/addons/core/functions/Ammunition/fn_randomRifle.sqf

    Co-authored-by: Jouni Järvinen <[email protected]>

    * Adds LIB_FLARE_PISTOL to Overrides

    ---------

    Co-authored-by: Jouni Järvinen <[email protected]>

commit 367d91a
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 04:01:20 2024 +0000

    Fix fallback code for militia lacking cargo trucks

commit a1b41ee
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 03:48:49 2024 +0000

    Add more logging for rebel and enemy airstrikes

commit 15e4e41
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 03:23:00 2024 +0000

    Fix case where remote-controlling players didn't spawn rebel or civ markers

commit c1c0f57
Merge: 2d0eccb 6c3d494
Author: Bob-Murphy <[email protected]>
Date:   Mon Jan 29 22:09:06 2024 +0100

    Merge pull request #3112 from official-antistasi-community/tolgee-update-1706560000

    Updated Stringtable files

commit 6c3d494
Author: Bob-Murphy <[email protected]>
Date:   Mon Jan 29 20:26:40 2024 +0000

    Automated Tolgee Update

commit 2d0eccb
Author: ante185 <[email protected]>
Date:   Sun Jan 28 19:20:32 2024 +0100

    Western Sahara Faction update (#3091)

    * Reskinned T100

    * ION 30mm APC, MRL truck, Texture lists

    * Update WS_AI_CSAT_NAfrica.sqf

    Officer loadout, tracked vics moved to IFV

    * ION loadout tuning

    shifted guns around for consistency, added IFV, replaced slammers with black T100

    * Update WS_AI_SFIA.sqf

    Weapon lineup tuned. IFVs moved to IFV category, expanded case for APEX dlc, added case for Contact DLC

    * Update WS_AI_SFIA.sqf

    * update

    * Update ws_ion.hpp

    * moved

    * Adjusted light armed and militia cars

    * Update WS_AI_SFIA.sqf

    * removed not-yet existing APCs

    * Update WS_AI_CSAT_NAfrica.sqf

    * moved IFV's to APC pending #3049

    * NATO Officer

    * Update WS_AI_ION.sqf

    * Update WS_AI_NATO_Desert.sqf

    * Update WS_AI_ADF.sqf

    * Update armor.hpp

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit c55e2c6
Author: ante185 <[email protected]>
Date:   Sun Jan 28 18:57:49 2024 +0100

    Cleaned up vanilla/ifv.hpp & armour.hpp (#3109)

    * Revert "CfgVehicles fix"

    This reverts commit 5b4761e.

    * moved a3a_APC_Wheeled_03_cannon_blufor_F

commit 5b4761e
Author: Bob-Murphy <[email protected]>
Date:   Sat Jan 27 10:04:15 2024 +0100

    CfgVehicles fix

commit 1d36293
Merge: 1bdc1c1 8730d26
Author: Bob-Murphy <[email protected]>
Date:   Thu Jan 25 15:08:01 2024 +0100

    Merge pull request #3108 from ante185/config_fixes_cleanup0

    Removed debug scope from a3a rhs t-72

commit 8730d26
Author: ante <[email protected]>
Date:   Thu Jan 25 15:00:12 2024 +0100

    Removed debug scope from a3a rhs t-72

commit 1bdc1c1
Author: ante185 <[email protected]>
Date:   Wed Jan 24 19:49:25 2024 +0100

    3CB LSM rebel template. (#3081)

    * 8mm CZ-550

    * Update 3CB_AI_LDF.sqf

    * Create 3CB_Reb_LSM.sqf

    * Update Templates.hpp

    * Update 3CB_Reb_Vehicle_Attributes.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_Vehicle_Attributes.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update CfgWeapons.hpp

    * Update Templates.hpp

    * Update Templates.hpp

    * name shortening

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 32866c8
Author: ante185 <[email protected]>
Date:   Wed Jan 24 19:48:00 2024 +0100

    RHS CHDKZ - Officer loadout & 3CB uniform support (#3037)

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Climate dependent 3cb uniform selection.

    * Update RHS_AI_ChDKZ.sqf

commit ad9d854
Author: Play3rgg <[email protected]>
Date:   Wed Jan 24 20:47:33 2024 +0200

    CUP AFRF Desert Template (#3022)

    Commit for CUP AFRF Desert Template, that uses the russian Pink Desert camouflage.

commit 254d518
Author: ante185 <[email protected]>
Date:   Wed Jan 24 17:29:53 2024 +0100

    Vanilla Slat Caged APCs (#3049)

    * Update armor.hpp

    * NATO

    * CSAT

    * AAF LDF

    * corrected T140 variant used by non-arid CSAT

    * created 11 more classes

    * FIX

    * CSAT LDF AAF

    * Create ws_ifv.hpp

    * Update ws_ifv.hpp

    * WS armour

    * NATO APCs

    * csat sfia ion

    * ion atgm

    * CSAT fin

    * Update ws_ifv.hpp

    * Update Vanilla_AI_LDF.sqf

    * Update CfgVehicles.hpp

commit 09e8625
Author: targetingsnake <[email protected]>
Date:   Wed Jan 24 17:26:57 2024 +0100

    Gm templates desert prep (#2802)

    * started BW-Templates arctic

    * started nva winter template (currently copy of existing one)

    * added swaped stuff in nva template; corrected artillery part in bw arctiv template

    * finished winter

    * fixed errors

    * updated GM-Vehicle-Attributes

    * added BW desert Camo

    * commented BW Desert template out

    * changed east german helmets

    * updated the old perpared desert template with the current temeperate one

    * added changes in templates

    * started with desert vehicles in desert templates

    * Swaped BW weapons and vehicles in Desert Template to desert or Olive versions

    * swapped uniforms to desert ones, didn't find some for militia

    * prepared desert NVA template

    * added NVA desert vehicles, fixed issue with sg550 and sg551 magazines in BW template (Error only in Logiles, afaik no report)

    * fixed issues with wrong magazines for a certain weapon in the nva templates

    * added CUP rebel uniforms to template aswell

    * corrected config error

    * fixed issues with mounting weapons and loading crates on ammotruck of GM, also fixed #2761

    * Name shortening and missing space

    * fixed issue

    ---------

    Co-authored-by: targetingsnake <[email protected]>
    Co-authored-by: Bob-Murphy <[email protected]>

commit 530fefc
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 23 23:29:55 2024 +0100

    Weferlingen & Colombia fixes (#3107)

    * colombia - moved initial hq

    * Weferlingen - remove trees from roads

    * weferlingen - added buildable objects and fixed winter climate

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 2f90e16
Author: Tiny-DM <[email protected]>
Date:   Tue Jan 23 17:29:19 2024 -0500

    Miscellaneous fixes - Batch 1 (Tiny) (#3102)

    * initial commit (fn_captureX)

    * core/functions/ai localization

    * addons/core/base (jesus christ)

    * convoy, create, dialogs

    * up through the end of OrgPlayers

    * punishment and reinf

    * core done. on to the stringtable

    im not looking forward to this

    * ....done?

    everything is done. no testing and reworks yet

    * refinements, on to testing

    when I get off my lazy ass (never)

    * save so I can continue on my laptop tomorrow

    * saving again

    * im losing my sanity

    * final commit before PR

    * I deny making these bugs

    * I lied about being done btw

    * no im serious this time

    * Complete - Awaiting Review

    * Changes by rautamiekka

    I had to change _level into a string to make it convert properly but otherwise this is rauta's

    * Actually completed this time

    Finished a few stray lines that had the //TODO: Localize tag on them. Further lines can be tagged as needed. Ready for review.

    * Updated files -- KNOWN BUG

    * github please work

    * merge resolved

    * Change by John + 1

    reverted a change accidentally made here that should have been in another branch

    * Minor syntax fix

    Always test your changes kids

    * fixed random response selection

    known issue

    * Changes from Bob + more

    Fixed a minor bug preventing resourcesFIA from showing properly. Learned my lesson not to touch Barbolani code without understanding exactly how it works.

    * Minor fix

    somehow I still fucked something up. added stringtables for "you damaged a friendly as cas/admin/driver/arty". Fixed the autosave start message.

    * initial commit

    ok this time we make sure everything works on the FIRST commit not the 29TH

    * experimental update

    NOT TESTED - DROPBOX BEING STUPID

    * minor fixes for prev bugs

    * small fix that slipped through

    * another tiny fix

    * third batch (UNSTABLE)

    these changes are NOT tested.

    * Revert "Merge branch 'more-unstable-internal' into misc-fixes-batch1"

    This reverts commit b792d20, reversing
    changes made to 3d8ecf0.

    * fixes for prev commit (RDY)

    * fixes from John

    * more misc fixes (RDY)

    * 1.22.24 fixes (UNTESTED)

    * minor fixes from John (RDY)

    * Changes by Bob and Rauta (UNTESTED))

commit 4114cfe
Author: Ellis Nielsen <[email protected]>
Date:   Tue Jan 23 16:28:19 2024 -0600

    Added: More builder boxes (#3098)

    * larger builder boxes

    * removed two largest options

    * stringtable adaptation

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit f771de7
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 22:40:12 2024 +0100

    stringtable fix

commit 6fd16f8
Author: ante185 <[email protected]>
Date:   Sun Jan 21 17:14:47 2024 +0100

    Vanilla LFF rebel faction (#3082)

    * Created the LLF faction

    * Identities

    * launch_RPG32_green_F

    * enoch offroads

    * Update Templates.hpp

    * renamed files

    * Update Templates.hpp

    * Update Vanilla_Reb_LFF.sqf

commit 15b4179
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 17:12:25 2024 +0100

    [Map Port] Weferlingen (#3075)

    * weferlingen initial upload

    * whiteboard

    * sqm

    * sqm updates

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 0e7b45c
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 11:55:35 2024 +0100

    [Map Port] Colombia (#3073)

    * UMB_Colombia

    * adding buildObjects

    * whiteboard

    * climate change

    * sqm update

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 032e2a5
Author: Tiny-DM <[email protected]>
Date:   Sat Jan 20 21:14:39 2024 -0500

    Stringtabling the rest of core (#3089)

    * initial commit (fn_captureX)

    * core/functions/ai localization

    * addons/core/base (jesus christ)

    * convoy, create, dialogs

    * up through the end of OrgPlayers

    * punishment and reinf

    * core done. on to the stringtable

    im not looking forward to this

    * ....done?

    everything is done. no testing and reworks yet

    * refinements, on to testing

    when I get off my lazy ass (never)

    * save so I can continue on my laptop tomorrow

    * saving again

    * im losing my sanity

    * final commit before PR

    * I deny making these bugs

    * I lied about being done btw

    * no im serious this time

    * Complete - Awaiting Review

    * Changes by rautamiekka

    I had to change _level into a string to make it convert properly but otherwise this is rauta's

    * Actually completed this time

    Finished a few stray lines that had the //TODO: Localize tag on them. Further lines can be tagged as needed. Ready for review.

    * Updated files -- KNOWN BUG

    * github please work

    * merge resolved

    * Change by John + 1

    reverted a change accidentally made here that should have been in another branch

    * Minor syntax fix

    Always test your changes kids

    * fixed random response selection

    known issue

    * Changes from Bob + more

    Fixed a minor bug preventing resourcesFIA from showing properly. Learned my lesson not to touch Barbolani code without understanding exactly how it works.

    * Minor fix

    somehow I still fucked something up. added stringtables for "you damaged a friendly as cas/admin/driver/arty". Fixed the autosave start message.

    * small fix that slipped through

    * another tiny fix

    * punctuation & removed non-english changes

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit b04fa73
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:53 2024 +0100

    template update

commit 542c479
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:44 2024 +0100

    Update PIC.jpg

commit c6707fb
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:39 2024 +0100

    Create whiteboard.jpg

commit 0d8166a
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:36 2024 +0100

    Update fn_createAIcontrols.sqf

commit ea8a26f
Author: ante <[email protected]>
Date:   Fri Jan 5 01:59:34 2024 +0100

    Staszow, initial push

commit 8c4917c
Author: ante <[email protected]>
Date:   Fri Jan 5 01:58:56 2024 +0100

    Sark update, static spawns

commit 4c6a553
Author: ante <[email protected]>
Date:   Fri Jan 5 01:57:30 2024 +0100

    Update IFA_Reb_Vehicle_Attributes.sqf

commit 98c4a58
Author: ante <[email protected]>
Date:   Fri Jan 5 01:57:23 2024 +0100

    Update fn_milBuildings.sqf

commit 895a255
Author: ante <[email protected]>
Date:   Fri Jan 5 01:57:02 2024 +0100

    Update IFA_AI_ALLIES.sqf

commit 0f014e6
Author: ante <[email protected]>
Date:   Tue Jan 2 04:10:35 2024 +0100

    IFA Statics buildings update

commit b92cff7
Author: ante <[email protected]>
Date:   Mon Jan 1 22:26:33 2024 +0100

    Sark updates

commit 4e2ac89
Author: ante <[email protected]>
Date:   Mon Jan 1 22:26:17 2024 +0100

    winter/desert rebel vehicles

commit 560a3e8
Author: ante <[email protected]>
Date:   Mon Jan 1 22:25:57 2024 +0100

    Update mission.sqm

commit 6609521
Author: ante <[email protected]>
Date:   Sat Dec 30 08:03:54 2023 +0100

    Torbruk

commit bd08765
Author: ante <[email protected]>
Date:   Sat Dec 30 08:03:37 2023 +0100

    rebel civilian vehicles

commit cfb56c2
Author: ante <[email protected]>
Date:   Sat Dec 30 08:03:20 2023 +0100

    Comments

commit fae98e5
Author: ante <[email protected]>
Date:   Fri Dec 29 00:11:01 2023 +0100

    Update mission.sqm

commit 4f8d6d1
Author: ante <[email protected]>
Date:   Fri Dec 29 00:02:48 2023 +0100

    Sark testbed update

commit e132fe8
Author: ante <[email protected]>
Date:   Fri Dec 29 00:02:04 2023 +0100

    used launcher categories

commit a341089
Author: ante <[email protected]>
Date:   Fri Dec 29 00:01:54 2023 +0100

    template fixes

commit 5e0d0e4
Author: ante <[email protected]>
Date:   Thu Dec 28 21:52:32 2023 +0100

    Bayonets and weapon tweaks

commit a5f211f
Author: ante <[email protected]>
Date:   Thu Dec 28 21:52:19 2023 +0100

    Home Army

commit 3876116
Author: ante <[email protected]>
Date:   Thu Dec 28 17:31:41 2023 +0100

    Updated flags, added low air attribute

commit 649c593
Author: ante <[email protected]>
Date:   Wed Dec 27 01:03:40 2023 +0100

    REB Vehicle Attributes lines

commit b831536
Author: ante <[email protected]>
Date:   Wed Dec 27 01:03:29 2023 +0100

    "Police" voicelines

commit 8356846
Author: ante <[email protected]>
Date:   Tue Dec 26 23:48:54 2023 +0100

    Arsenal fixed

commit 9d9f9be
Author: ante <[email protected]>
Date:   Tue Dec 26 23:45:01 2023 +0100

    Rebel vehicle and vehicle cost update

commit 2dab3eb
Merge: 55e70b4 e77cf0d
Author: ante <[email protected]>
Date:   Tue Dec 26 22:39:46 2023 +0100

    Merge branch 'unstable' into IFA-AIO
ante185 added a commit that referenced this pull request Mar 28, 2024
@ante185
Squashed commit of the following:
4c95536 
commit ea24fd7
Author: ante <[email protected]>
Date:   Wed Mar 13 21:17:23 2024 +0100

    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

commit e1d1982
Author: ante <[email protected]>
Date:   Wed Mar 13 20:54:00 2024 +0100

    Update fn_setPlaneLoadout.sqf

commit 9cf8683
Author: ante <[email protected]>
Date:   Wed Mar 13 20:52:46 2024 +0100

    Update fn_categoryOverrides.sqf

commit b58873f
Author: ante <[email protected]>
Date:   Sun Mar 10 17:37:51 2024 +0100

    Updated seats blocked by logi

commit bf4ec09
Author: ante <[email protected]>
Date:   Sun Mar 10 17:03:48 2024 +0100

    tanker kit adjustment

commit f22cbe4
Author: ante <[email protected]>
Date:   Sun Mar 10 16:18:23 2024 +0100

    Update IFA_AI_UK.sqf

commit 5b24034
Author: ante <[email protected]>
Date:   Sun Mar 10 15:54:56 2024 +0100

    Radios (To match SPE)

commit 7fe9399
Author: ante <[email protected]>
Date:   Sun Mar 10 15:41:57 2024 +0100

    IFA logistics

commit 52a180f
Author: ante <[email protected]>
Date:   Fri Mar 8 21:27:23 2024 +0100

    "attributeLowAir", true

commit 2031a6b
Author: ante <[email protected]>
Date:   Fri Mar 8 21:20:52 2024 +0100

    Update IFA_REB_FFI.sqf

commit 4ea35bd
Author: ante <[email protected]>
Date:   Fri Mar 8 21:12:09 2024 +0100

    flags & boats

commit 1709722
Author: ante <[email protected]>
Date:   Fri Mar 8 21:06:50 2024 +0100

    rebel car adjustments

commit 4182363
Author: ante <[email protected]>
Date:   Fri Mar 8 20:59:50 2024 +0100

    Update Templates.hpp

commit a227049
Author: ante <[email protected]>
Date:   Fri Mar 8 20:58:28 2024 +0100

    Create IFA_Vehicle_Attributes.sqf

commit 6430d32
Author: ante <[email protected]>
Date:   Fri Mar 8 20:58:24 2024 +0100

    IFA US, UK, & Combined

commit 3c4f471
Author: ante <[email protected]>
Date:   Fri Mar 8 20:57:46 2024 +0100

    Create IFA_AI_SOV.sqf

commit 61cd6e3
Author: ante <[email protected]>
Date:   Fri Mar 8 20:57:35 2024 +0100

    Create IFA_AI_WEH.sqf

commit 107a8db
Author: ante <[email protected]>
Date:   Fri Mar 8 20:57:22 2024 +0100

    IFA Civilians

commit 0aae58d
Author: ante <[email protected]>
Date:   Fri Mar 8 20:56:58 2024 +0100

    IFA Rebels

commit efa5448
Author: ante <[email protected]>
Date:   Fri Mar 8 20:54:37 2024 +0100

    IFA Markers & Flags

commit 6a9361c
Merge: 31609ef 2a2ffd8
Author: Bob-Murphy <[email protected]>
Date:   Sun Mar 3 14:41:31 2024 +0100

    Merge pull request #3163 from official-antistasi-community/tolgee-update-1709472690

    Updated Stringtable files

commit 2a2ffd8
Author: Bob-Murphy <[email protected]>
Date:   Sun Mar 3 13:31:30 2024 +0000

    Automated Tolgee Update

commit 31609ef
Merge: 46e9780 08f0ca0
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 18:40:06 2024 +0100

    Merge pull request #3156 from official-antistasi-community/3.5.1

    3.5.1 version and changelog

commit 46e9780
Merge: 927361f 6e9c0f1
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 18:36:11 2024 +0100

    Merge pull request #3157 from official-antistasi-community/tolgee-update-1708277554

    Updated Stringtable files

commit 6e9c0f1
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 17:32:34 2024 +0000

    Automated Tolgee Update

commit 08f0ca0
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 11:46:27 2024 +0100

    version and changelog

commit 927361f
Merge: 6517087 e709901
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 11:35:06 2024 +0100

    Merge pull request #3155 from official-antistasi-community/3119

    3119 - kujari map fixes

commit 6517087
Merge: bdfd7ed 08ea558
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:56:36 2024 +0100

    Merge pull request #3151 from jaj22/remove-artySupport-forcedspawn

    Disable forced marker spawn in artySupport

commit bdfd7ed
Merge: 5aeba0a f46ad2b
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:55:39 2024 +0100

    Merge pull request #3150 from jaj22/fix-LDF-rogue-var

    Fix rogue var breaking vanilla LDF template

commit 5aeba0a
Merge: 61e1c61 5adeb8d
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:55:02 2024 +0100

    Merge pull request #3147 from Tiny-DM/3.5.1-fixes

    3.5.1 Undercover and Defend fixes

commit e709901
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:52:10 2024 +0100

    3119 fixes

commit 08ea558
Author: John Jordan <[email protected]>
Date:   Fri Feb 16 21:18:19 2024 +0000

    Disable forced marker spawn in artySupport (rebel HC arty)

commit f46ad2b
Author: John Jordan <[email protected]>
Date:   Fri Feb 16 21:13:28 2024 +0000

    Fix rogue var breaking vanilla LDF template

commit 5adeb8d
Author: Tiny-DM <[email protected]>
Date:   Tue Feb 13 13:22:00 2024 -0500

    Initial Commit (UNTESTED)

commit 61e1c61
Merge: dae0828 f4f8049
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 21:09:38 2024 +0100

    Merge pull request #3144 from jaj22/fix-missing-actionRevive-localize

    Fix missing localize in actionRevive

commit dae0828
Merge: ef4cec3 b9f0ba7
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 21:09:26 2024 +0100

    Merge pull request #3143 from jaj22/fix-double-destroyCity

    Orbital strike already destroys the city naturally, don't do it twice

commit f4f8049
Author: John Jordan <[email protected]>
Date:   Sun Feb 11 19:52:10 2024 +0000

    Fix missing localize in actionRevive

commit b9f0ba7
Author: John Jordan <[email protected]>
Date:   Sun Feb 11 19:46:07 2024 +0000

    Orbital strike already destroys the city naturally, don't do it twice

commit ef4cec3
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 19:27:13 2024 +0100

    preliminary 3.5.0 changelog (#3135)

    * preliminary 3.5.0 changelog

    * adjustments based on tinys input

    * 3134 addition

    * 3137

    * 3131

    * 2802

    * typo fix

    * 3139

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 3864669
Merge: ea2c3cc a77fe5a
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 13:14:49 2024 +0100

    Merge pull request #3140 from official-antistasi-community/tolgee-update-1707653626

    Updated Stringtable files

commit a77fe5a
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 12:13:47 2024 +0000

    Automated Tolgee Update

commit ea2c3cc
Author: jaj22 <[email protected]>
Date:   Sun Feb 11 12:12:48 2024 +0000

    Make SLAT IFVs CBA-compatible (#3128)

    * Make SLAT IFVs CBA-compatible

    * Remove extra init EH if vehicle already has initVehicle in EH

    * Make WS IFVs CBA-compatible

commit 5d5c821
Author: Tiny-DM <[email protected]>
Date:   Sat Feb 10 17:32:12 2024 -0500

    Vehicle discounts with no seaports (#3137)

    * Update fn_vehiclePrice.sqf

    added additional conditions for vehicle pricing

    * add additional war level tiers to calc

commit a0c1714
Author: jaj22 <[email protected]>
Date:   Sat Feb 10 20:41:27 2024 +0000

    Cull large builder boxes because they don't work yet (#3139)

    The very large builder boxes don't fit in either width or weight for a lot of vehicles that they'll load into. Can be fixed later, but not in 3.5. Also the gameplay need for them is questionable: We probably don't want people building or repairing that much.

    Buffed the "large" box to 1500 as a placeholder.

commit 1df0da1
Author: targetingsnake <[email protected]>
Date:   Sat Feb 10 21:39:57 2024 +0100

    readded debug functions second time (#3131)

    * readed debug functions seccond time

    ---------

    Co-authored-by: targetingsnake <[email protected]>

commit 6540b7c
Merge: 8cbc8e7 b580a2d
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 12:39:53 2024 +0100

    Merge pull request #3138 from official-antistasi-community/tolgee-update-1707565006

    Updated Stringtable files

commit b580a2d
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 11:36:46 2024 +0000

    Automated Tolgee Update

commit 8cbc8e7
Merge: 1e03950 53e2985
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 11:20:46 2024 +0100

    Merge pull request #3134 from jaj22/add-construction-button-hint

    Add hint to help older players find the new construction system

commit 53e2985
Author: John Jordan <[email protected]>
Date:   Fri Feb 9 20:18:08 2024 +0000

    Add hint to help older players find the new construction system

commit 1e03950
Merge: 16fa821 b0b9e09
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 21:52:21 2024 +0100

    Merge pull request #3133 from official-antistasi-community/tolgee-update-1707425397

    Updated Stringtable files

commit b0b9e09
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 20:49:57 2024 +0000

    Automated Tolgee Update

commit 16fa821
Merge: d3ba88a 0bc0367
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 21:47:20 2024 +0100

    Merge pull request #3126 from jaj22/fix-airspaceControl-exploit

    Fix cases where airspaceControl wouldn't execute

commit d3ba88a
Author: Tiny-DM <[email protected]>
Date:   Thu Feb 8 15:46:37 2024 -0500

    Misc fixes batch 2 (#3110)

    * initial commit (UNTESTED)

    * second major commit (TESTED)

    * hotfix by John

    * Additional fixes, removed 2585

    * Stringtable update (why github)

    funny merge conflict

    * Update Stringtable.xml

    misc new line in stringtable, removed

    * fixed patrol arm routine

    * Minor updates (localization + john's comment)

commit f24ab7c
Author: targetingsnake <[email protected]>
Date:   Thu Feb 8 11:01:02 2024 +0100

    Fix Crashes on GM Desert Templates (#3120)

    * added function for Checking vehicles in templates

    * imporved vehicle script

    * fix for servers crashing on desert template

    * removed testcode

    ---------

    Co-authored-by: targetingsnake <[email protected]>

commit d6ab4ea
Merge: a174dbe 4afd496
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 08:47:59 2024 +0100

    Merge pull request #3129 from official-antistasi-community/tolgee-update-1707205400

    Updated Stringtable files

commit 4afd496
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 07:43:19 2024 +0000

    Automated Tolgee Update

commit a174dbe
Merge: 63e90d6 06ad9f6
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 08:42:08 2024 +0100

    Merge pull request #3123 from jaj22/fix-petros-placement-hintC

    Fix petros placement stringtable conversion bug

commit 0bc0367
Author: John Jordan <[email protected]>
Date:   Mon Feb 5 22:38:09 2024 +0000

    Fix cases where airspaceControl wouldn't execute despite a player flying an air vehicle

commit 06ad9f6
Author: John Jordan <[email protected]>
Date:   Sat Feb 3 04:55:23 2024 +0000

    Fix bogus array wrapper on hintC that prevented the petros placement UI from appearing

commit 63e90d6
Merge: 84121b4 c908f2e
Author: Bob-Murphy <[email protected]>
Date:   Wed Jan 31 10:01:26 2024 +0100

    Merge pull request #3118 from official-antistasi-community/tolgee-update-1706691491

    Updated Stringtable files

commit c908f2e
Author: Bob-Murphy <[email protected]>
Date:   Wed Jan 31 08:58:11 2024 +0000

    Automated Tolgee Update

commit 84121b4
Merge: 9fd39fb 15e4e41
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 23:29:14 2024 +0100

    Merge pull request #3114 from jaj22/fix-RC-spawning

    Fix remote-controlling players despawning rebel garrisons & civs

commit 9fd39fb
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:21:00 2024 +0100

    proper map pics and blurb fix (#3117)

    * proper map pics

    * blurb

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit a5aa69d
Merge: 02bb42c 367d91a
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:18:37 2024 +0100

    Merge pull request #3116 from jaj22/fix-cargoTrucks-fallback

    Fix fallback code for militia lacking cargo trucks

commit 02bb42c
Merge: bebc9de a1b41ee
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:18:28 2024 +0100

    Merge pull request #3115 from jaj22/log-rebel-airstrikes

    Add more logging for rebel and enemy airstrikes

commit bebc9de
Author: ante185 <[email protected]>
Date:   Tue Jan 30 15:18:16 2024 +0100

    Pistols for rebel AI - case (#3083)

    * Update fn_categoryOverrides.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_randomRifle.sqf

    * Update fn_randomRifle.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_categoryOverrides.sqf

    * Update fn_randomRifle.sqf

    * Update A3A/addons/core/functions/Ammunition/fn_randomRifle.sqf

    Co-authored-by: Jouni Järvinen <[email protected]>

    * Adds LIB_FLARE_PISTOL to Overrides

    ---------

    Co-authored-by: Jouni Järvinen <[email protected]>

commit 367d91a
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 04:01:20 2024 +0000

    Fix fallback code for militia lacking cargo trucks

commit a1b41ee
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 03:48:49 2024 +0000

    Add more logging for rebel and enemy airstrikes

commit 15e4e41
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 03:23:00 2024 +0000

    Fix case where remote-controlling players didn't spawn rebel or civ markers

commit c1c0f57
Merge: 2d0eccb 6c3d494
Author: Bob-Murphy <[email protected]>
Date:   Mon Jan 29 22:09:06 2024 +0100

    Merge pull request #3112 from official-antistasi-community/tolgee-update-1706560000

    Updated Stringtable files

commit 6c3d494
Author: Bob-Murphy <[email protected]>
Date:   Mon Jan 29 20:26:40 2024 +0000

    Automated Tolgee Update

commit 2d0eccb
Author: ante185 <[email protected]>
Date:   Sun Jan 28 19:20:32 2024 +0100

    Western Sahara Faction update (#3091)

    * Reskinned T100

    * ION 30mm APC, MRL truck, Texture lists

    * Update WS_AI_CSAT_NAfrica.sqf

    Officer loadout, tracked vics moved to IFV

    * ION loadout tuning

    shifted guns around for consistency, added IFV, replaced slammers with black T100

    * Update WS_AI_SFIA.sqf

    Weapon lineup tuned. IFVs moved to IFV category, expanded case for APEX dlc, added case for Contact DLC

    * Update WS_AI_SFIA.sqf

    * update

    * Update ws_ion.hpp

    * moved

    * Adjusted light armed and militia cars

    * Update WS_AI_SFIA.sqf

    * removed not-yet existing APCs

    * Update WS_AI_CSAT_NAfrica.sqf

    * moved IFV's to APC pending #3049

    * NATO Officer

    * Update WS_AI_ION.sqf

    * Update WS_AI_NATO_Desert.sqf

    * Update WS_AI_ADF.sqf

    * Update armor.hpp

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit c55e2c6
Author: ante185 <[email protected]>
Date:   Sun Jan 28 18:57:49 2024 +0100

    Cleaned up vanilla/ifv.hpp & armour.hpp (#3109)

    * Revert "CfgVehicles fix"

    This reverts commit 5b4761e.

    * moved a3a_APC_Wheeled_03_cannon_blufor_F

commit 5b4761e
Author: Bob-Murphy <[email protected]>
Date:   Sat Jan 27 10:04:15 2024 +0100

    CfgVehicles fix

commit 1d36293
Merge: 1bdc1c1 8730d26
Author: Bob-Murphy <[email protected]>
Date:   Thu Jan 25 15:08:01 2024 +0100

    Merge pull request #3108 from ante185/config_fixes_cleanup0

    Removed debug scope from a3a rhs t-72

commit 8730d26
Author: ante <[email protected]>
Date:   Thu Jan 25 15:00:12 2024 +0100

    Removed debug scope from a3a rhs t-72

commit 1bdc1c1
Author: ante185 <[email protected]>
Date:   Wed Jan 24 19:49:25 2024 +0100

    3CB LSM rebel template. (#3081)

    * 8mm CZ-550

    * Update 3CB_AI_LDF.sqf

    * Create 3CB_Reb_LSM.sqf

    * Update Templates.hpp

    * Update 3CB_Reb_Vehicle_Attributes.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_Vehicle_Attributes.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update CfgWeapons.hpp

    * Update Templates.hpp

    * Update Templates.hpp

    * name shortening

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 32866c8
Author: ante185 <[email protected]>
Date:   Wed Jan 24 19:48:00 2024 +0100

    RHS CHDKZ - Officer loadout & 3CB uniform support (#3037)

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Climate dependent 3cb uniform selection.

    * Update RHS_AI_ChDKZ.sqf

commit ad9d854
Author: Play3rgg <[email protected]>
Date:   Wed Jan 24 20:47:33 2024 +0200

    CUP AFRF Desert Template (#3022)

    Commit for CUP AFRF Desert Template, that uses the russian Pink Desert camouflage.

commit 254d518
Author: ante185 <[email protected]>
Date:   Wed Jan 24 17:29:53 2024 +0100

    Vanilla Slat Caged APCs (#3049)

    * Update armor.hpp

    * NATO

    * CSAT

    * AAF LDF

    * corrected T140 variant used by non-arid CSAT

    * created 11 more classes

    * FIX

    * CSAT LDF AAF

    * Create ws_ifv.hpp

    * Update ws_ifv.hpp

    * WS armour

    * NATO APCs

    * csat sfia ion

    * ion atgm

    * CSAT fin

    * Update ws_ifv.hpp

    * Update Vanilla_AI_LDF.sqf

    * Update CfgVehicles.hpp

commit 09e8625
Author: targetingsnake <[email protected]>
Date:   Wed Jan 24 17:26:57 2024 +0100

    Gm templates desert prep (#2802)

    * started BW-Templates arctic

    * started nva winter template (currently copy of existing one)

    * added swaped stuff in nva template; corrected artillery part in bw arctiv template

    * finished winter

    * fixed errors

    * updated GM-Vehicle-Attributes

    * added BW desert Camo

    * commented BW Desert template out

    * changed east german helmets

    * updated the old perpared desert template with the current temeperate one

    * added changes in templates

    * started with desert vehicles in desert templates

    * Swaped BW weapons and vehicles in Desert Template to desert or Olive versions

    * swapped uniforms to desert ones, didn't find some for militia

    * prepared desert NVA template

    * added NVA desert vehicles, fixed issue with sg550 and sg551 magazines in BW template (Error only in Logiles, afaik no report)

    * fixed issues with wrong magazines for a certain weapon in the nva templates

    * added CUP rebel uniforms to template aswell

    * corrected config error

    * fixed issues with mounting weapons and loading crates on ammotruck of GM, also fixed #2761

    * Name shortening and missing space

    * fixed issue

    ---------

    Co-authored-by: targetingsnake <[email protected]>
    Co-authored-by: Bob-Murphy <[email protected]>

commit 530fefc
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 23 23:29:55 2024 +0100

    Weferlingen & Colombia fixes (#3107)

    * colombia - moved initial hq

    * Weferlingen - remove trees from roads

    * weferlingen - added buildable objects and fixed winter climate

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 2f90e16
Author: Tiny-DM <[email protected]>
Date:   Tue Jan 23 17:29:19 2024 -0500

    Miscellaneous fixes - Batch 1 (Tiny) (#3102)

    * initial commit (fn_captureX)

    * core/functions/ai localization

    * addons/core/base (jesus christ)

    * convoy, create, dialogs

    * up through the end of OrgPlayers

    * punishment and reinf

    * core done. on to the stringtable

    im not looking forward to this

    * ....done?

    everything is done. no testing and reworks yet

    * refinements, on to testing

    when I get off my lazy ass (never)

    * save so I can continue on my laptop tomorrow

    * saving again

    * im losing my sanity

    * final commit before PR

    * I deny making these bugs

    * I lied about being done btw

    * no im serious this time

    * Complete - Awaiting Review

    * Changes by rautamiekka

    I had to change _level into a string to make it convert properly but otherwise this is rauta's

    * Actually completed this time

    Finished a few stray lines that had the //TODO: Localize tag on them. Further lines can be tagged as needed. Ready for review.

    * Updated files -- KNOWN BUG

    * github please work

    * merge resolved

    * Change by John + 1

    reverted a change accidentally made here that should have been in another branch

    * Minor syntax fix

    Always test your changes kids

    * fixed random response selection

    known issue

    * Changes from Bob + more

    Fixed a minor bug preventing resourcesFIA from showing properly. Learned my lesson not to touch Barbolani code without understanding exactly how it works.

    * Minor fix

    somehow I still fucked something up. added stringtables for "you damaged a friendly as cas/admin/driver/arty". Fixed the autosave start message.

    * initial commit

    ok this time we make sure everything works on the FIRST commit not the 29TH

    * experimental update

    NOT TESTED - DROPBOX BEING STUPID

    * minor fixes for prev bugs

    * small fix that slipped through

    * another tiny fix

    * third batch (UNSTABLE)

    these changes are NOT tested.

    * Revert "Merge branch 'more-unstable-internal' into misc-fixes-batch1"

    This reverts commit b792d20, reversing
    changes made to 3d8ecf0.

    * fixes for prev commit (RDY)

    * fixes from John

    * more misc fixes (RDY)

    * 1.22.24 fixes (UNTESTED)

    * minor fixes from John (RDY)

    * Changes by Bob and Rauta (UNTESTED))

commit 4114cfe
Author: Ellis Nielsen <[email protected]>
Date:   Tue Jan 23 16:28:19 2024 -0600

    Added: More builder boxes (#3098)

    * larger builder boxes

    * removed two largest options

    * stringtable adaptation

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit f771de7
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 22:40:12 2024 +0100

    stringtable fix

commit 6fd16f8
Author: ante185 <[email protected]>
Date:   Sun Jan 21 17:14:47 2024 +0100

    Vanilla LFF rebel faction (#3082)

    * Created the LLF faction

    * Identities

    * launch_RPG32_green_F

    * enoch offroads

    * Update Templates.hpp

    * renamed files

    * Update Templates.hpp

    * Update Vanilla_Reb_LFF.sqf

commit 15b4179
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 17:12:25 2024 +0100

    [Map Port] Weferlingen (#3075)

    * weferlingen initial upload

    * whiteboard

    * sqm

    * sqm updates

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 0e7b45c
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 11:55:35 2024 +0100

    [Map Port] Colombia (#3073)

    * UMB_Colombia

    * adding buildObjects

    * whiteboard

    * climate change

    * sqm update

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 032e2a5
Author: Tiny-DM <[email protected]>
Date:   Sat Jan 20 21:14:39 2024 -0500

    Stringtabling the rest of core (#3089)

    * initial commit (fn_captureX)

    * core/functions/ai localization

    * addons/core/base (jesus christ)

    * convoy, create, dialogs

    * up through the end of OrgPlayers

    * punishment and reinf

    * core done. on to the stringtable

    im not looking forward to this

    * ....done?

    everything is done. no testing and reworks yet

    * refinements, on to testing

    when I get off my lazy ass (never)

    * save so I can continue on my laptop tomorrow

    * saving again

    * im losing my sanity

    * final commit before PR

    * I deny making these bugs

    * I lied about being done btw

    * no im serious this time

    * Complete - Awaiting Review

    * Changes by rautamiekka

    I had to change _level into a string to make it convert properly but otherwise this is rauta's

    * Actually completed this time

    Finished a few stray lines that had the //TODO: Localize tag on them. Further lines can be tagged as needed. Ready for review.

    * Updated files -- KNOWN BUG

    * github please work

    * merge resolved

    * Change by John + 1

    reverted a change accidentally made here that should have been in another branch

    * Minor syntax fix

    Always test your changes kids

    * fixed random response selection

    known issue

    * Changes from Bob + more

    Fixed a minor bug preventing resourcesFIA from showing properly. Learned my lesson not to touch Barbolani code without understanding exactly how it works.

    * Minor fix

    somehow I still fucked something up. added stringtables for "you damaged a friendly as cas/admin/driver/arty". Fixed the autosave start message.

    * small fix that slipped through

    * another tiny fix

    * punctuation & removed non-english changes

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bob-Murphy Bob-Murphy Bob-Murphy approved these changes

@targetingsnake targetingsnake Awaiting requested review from targetingsnake

Assignees
No one assigned
Labels
Added to changelog Added to changelog Bug Something isn't working Ready for merge
Projects
None yet
Milestone
3.5
Development

Successfully merging this pull request may close these issues.

[Bug]: Getting error when testing base spawns
2 participants
@jaj22 @Bob-Murphy