3.5.5 release (with conflicts resolved) #344
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
Launchers were incorrectly given to the opposite roles to what they needed to be
Fix issue 271
Issue 267
Increases number of RPK drums for 3IFB ARs to match NATO MX SW mag counts.
Uncomments the NVG definition to avoid errors; comments the part where they're *used* to maintain the original intent of no NVGs by default.
Replaces all direct additions of rangefinders/binocs with a reference to a variable defined in the faction main file.
Replaces Mk30 HMG bags for 3IFB, AAF, FIA, LDF, NPR, and Syndikat with M2 .50 bags of appropriate factions.
NPR also uses 75rd drums for their ARs, and also had only 2 spares per AR, so I made the same change as for 3IFB.
Mediterranean ghillies are garbo in woodland. LDF and 3IFB get the NATO Pacific ghillie, which isn't perfect but it's better, and NPR get the camo Gorka suit since they have Spetsnaz advisors.
it is what it is
This compensates for LAMBS Danger improved aggression and fire rate by reducing accuracy and aim speed.
I also copied the rest of the Urban alternative loadout from the Med file, since it was already partially present here.
Adds a briefing page summarizing mission conditions. Also fixes a bug with setTime. (was erroring on evening)
oops forgot this one
Significantly dialed down fog during rain in f_fnc_setWeather
Issue 251: Link to github wiki
All functionality for changing pilot NVGs independently of infantry remains in place.
Same problem as 3IFB had before
#331 added __has_include protection to createBriefing and assignGear
Issue #329: Make CasCap work with reinforcements
Issue #333: Remove "Unit" requirement in variable name for specialist markers
3.5.5 bugfixes 1
Update version number
Revert "Issue #329: Make CasCap work with reinforcements"
Closed
shadow-fa
approved these changes
Apr 27, 2021
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.
why do I have to do this. why not someone who doesn't hate working with github
This PR merges all changes from 3.5.5 dev to master, and also doesn't have a stupid merge conflict.
After this PR is merged, the dev branch should have master merged into it to prevent future merge conflicts.