merge to master for 3.6.0 #3331
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Added vehiclesHeavyTanks * Set vehiclesHeavyTanks cost and threat * set vehiclesHeavyTanks weights * Newlined createAIAirbase vehicles * set heavy tank resource cost 300 * Update fn_compileMissionAssets.sqf * Update fn_getVehiclesGroundSupport.sqf * Update fn_getVehiclesGroundSupport.sqf * removed example maths * Update fn_getVehiclesGroundSupport.sqf * Update fn_startBreachVehicle.sqf * Update fn_SUP_CASApproach.sqf * Update fn_getVehiclesGroundSupport.sqf
* added Poseidon II * set Poseidon II price * Stray comma
Fix case where seats may not be unlocked when dead crew are deleted
* Created air patrol category * Examples * tabulations and general neatening up * Update fn_initVarServer.sqf
* Update fn_vehiclePrice.sqf * Update fn_vehiclePrice.sqf * Update fn_vehiclePrice.sqf * round to 5
* Make artillery rotate to target before firing to prevent issues with limited arcs * Avoid zero divisor case
* initial commit (UNTESTED) * removed params restrictions * added nil protection and removed a nil check from resourcesFIA since that shouldn't be possible regardless. also removed some feedback because they're remoteExecs * added position check * changed "invalid" to ""
…ate-1714590117 Updated Stringtable files
* initial commit (WORKING, NOT RDY) * Changes from Ante (2024.4.7) * Updates across all files Moved helicopters, updated to unstable, changed a few colors, added custom classes * Updated all files (2024.4.12) * Changes from Ante (2024.4.13) * Update WS_AI_ION.sqf * Fixed scope and caps consistency * fixed missing helicopter * standardized capitalization * Update CfgVehicles.hpp
Merge item carrying code and switch to blacklist for carry blocking
* created loadout configs * modifed setPlaneLoadout to grab from config * fixed issue where plane would attempt to divebom without params * Update config.cpp * comment clarification * rest of vanilla + WS CAS plane * RHS Plane Loadouts * formatting * 3CB Factions * CUP cas * CUP cap * VN plane loadout * UNS * Tornado_AWS * IFA * IFA required addons * SPE * removed duplicate UK3CB_TKA_B_MIG21_AT * Comment purge, rereformatted
* initial commit (BROKEN) * main dev done (BROKEN) * somewhat working now (BROKEN) * update (WORKING, MINOR BUGS) * Update .gitignore * completed (WORKING, RDY) * Update fn_sellVehGRG.sqf * updated all files according to John * fix antistasi/garage seperation * add header + remove param * typo fixes Co-authored-by: Jouni Järvinen <[email protected]> * Remove dead code from garage sell vehicle display refresh --------- Co-authored-by: Jouni Järvinen <[email protected]> Co-authored-by: John Jordan <[email protected]>
Fix breaking error in citySupportChange type-safety checks
updates weapons of ADA SOV HIDF LDF TAK EAST MIX
* Update fn_SUP_CASApproach.sqf * Update fn_setPlaneLoadout.sqf * Adds T28 Trojan, attempts laser activation * Sorted planes to seperate vn planes from rhs/3cb * Update fn_setPlaneLoadout.sqf * Update fn_SUP_CASApproach.sqf * Update fn_SUP_CASRun.sqf * Update fn_setPlaneLoadout.sqf * Update fn_SUP_CASRun.sqf * It appears to work now * Update 3CB_AI_HIDF.sqf * Simplified solution * cleaned up setPlaneLoadout * Update 3CB_AI_HIDF.sqf * Update fn_SUP_CASRun.sqf * Update fn_SUP_CASRun.sqf * Updated Super Tucano behaviour * Revert "Updated Super Tucano behaviour" This reverts parts of commit fbfc6ad. * moved T28 to config, update A29 * gunnerLasers * Update fn_SUP_CASRun.sqf
* Update 3CBFactions.hpp * quick fix to an overwritten vic * Update 3CBFactions.hpp
Removed testing code
Refugee mission timer fix
"Readds" the RPD to the 3CB SOV template
* Switch Antistasi medical respawn & self-revive keys to custom keybind system * Show actual bound keys in the unconscious HUD
Parachutes in airbase crates
* added ejection rocket and blade for ka52 * added space indentation to every entry
* initial commit (ready) * Update Stringtable.xml
…ate-1719081557 Updated Stringtable files
Fix for vehicle sell DS
IFA Replaced police vehicle with something less civilian
* 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
* Aircraft Price Reduction * Aircraft Loadout adjustments * Update config.cpp
Update RHS_AI_TLA military NVGs
Adjust air support response for cheap planes
* Fixed script error in new BattleMenu. * Fixed comment example for controlHC.
Added IFA-ACE-Compat detonators
* Update config.cpp * Update config.cpp
Fix conflicting addon messages from aircraft loadout configs
* new pics * capitalisation * fixes string issues --------- Co-authored-by: Bob-Murphy <[email protected]>
* version and preliminary changelog * updated changelog * update * update * udpate * update * update * update * update * update * cleanup and links * fix * fixes --------- Co-authored-by: Bob-Murphy <[email protected]>
…ate-1719777240 Updated Stringtable files
…ate-1719777517 Updated Stringtable files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge into master for 3.6.0
see changelog