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.

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

Update merge #3

Merged
merged 808 commits into from
Mar 20, 2024
Merged

Update merge #3

merged 808 commits into from
Mar 20, 2024

Conversation

RetardedFoX
Copy link
Owner

No description provided.

wersal454 and others added 30 commits October 7, 2023 22:09
* CUP civilian vehicles pack

* Add files via upload

* Update cup_veh_Civ.sqf

* fix

* Update cup_veh_Civ.sqf

remove commented out code

* changes for merge

* Change hilux to random color

---------

Co-authored-by: Bob-Murphy <[email protected]>
Co-authored-by: Ellis Nielsen <[email protected]>
…tistasi-community/tolgee-update-1696776590

Updated Stringtable files
…tistasi-community/further-localization

Further localization
…tistasi-community/tolgee-update-1697478620

Updated Stringtable files
Bob-Murphy and others added 28 commits February 10, 2024 11:36
…tistasi-community/tolgee-update-1707565006

Updated Stringtable files
* readed debug functions seccond time

---------

Co-authored-by: targetingsnake <[email protected]>
…asi-community#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.
* Update fn_vehiclePrice.sqf

added additional conditions for vehicle pricing

* add additional war level tiers to calc
* Make SLAT IFVs CBA-compatible

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

* Make WS IFVs CBA-compatible
…tistasi-community/tolgee-update-1707653626

Updated Stringtable files
* 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]>
…ouble-destroyCity

Orbital strike already destroys the city naturally, don't do it twice
…issing-actionRevive-localize

Fix missing localize in actionRevive
….1-fixes

3.5.1 Undercover and Defend fixes
…DF-rogue-var

Fix rogue var breaking vanilla LDF template
…e-artySupport-forcedspawn

Disable forced marker spawn in artySupport
…tistasi-community/3119

3119 - kujari map fixes
…tistasi-community/tolgee-update-1708277554

Updated Stringtable files
…tistasi-community/3.5.1

3.5.1 version and changelog
…tistasi-community/tolgee-update-1709472690

Updated Stringtable files
@RetardedFoX RetardedFoX self-assigned this Mar 20, 2024
@RetardedFoX RetardedFoX merged commit 19febd8 into AegisAtlas Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants