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

CDLC Compatibility - Reaction Forces #3185

Merged
merged 7 commits into from
Mar 30, 2024
Merged

CDLC Compatibility - Reaction Forces #3185

merged 7 commits into from
Mar 30, 2024

Conversation

Tiny-DM
Copy link

@Tiny-DM Tiny-DM commented Mar 26, 2024

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

Information:
Updated existing templates to use RF assets.
All rebel and civ factions for WS and vanilla are done, and all enemy factions for vanilla are done.
(will fill this section in later with details, review for now)

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.)

How can the changes be tested?

Steps:
Would prefer additional playtesting, but as it stands everything should be relatively solid.
KNOWN BUG: The non-undercover pickup will sometimes don civilian camos
Making the PR from internal branch to unstable now for testing purposes

@Tiny-DM Tiny-DM added Enhancement New feature or request Templates Items related to templates labels Mar 26, 2024
@Tiny-DM Tiny-DM requested a review from ante185 March 26, 2024 22:51
@Tiny-DM Tiny-DM self-assigned this Mar 26, 2024
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

Some stray errors that need fixing, but it is looking promising

A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/config_fixes/RF/CfgVehicles.hpp Outdated Show resolved Hide resolved
A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf Outdated Show resolved Hide resolved
A3A/addons/logistics/Nodes/RF.hpp Outdated Show resolved Hide resolved
@ante185 ante185 added the Change requested A change has been requested, and this can't be merged until it's done. label Mar 26, 2024
@Tiny-DM Tiny-DM requested a review from ante185 March 28, 2024 01:13
Tiny-DM and others added 4 commits March 27, 2024 21:17
RF Compat - Commit because I can't use GitHub properly
fixed a few semicolons
RPTs for all changed factions since last commit are clean. fixed issue with helicopter pylons.
Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

RPTs are clean, changes look good.
Only minor issues remain

Copy link

@ante185 ante185 left a comment

Choose a reason for hiding this comment

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

Looks good to me

A3A/addons/config_fixes/RF/CfgVehicles.hpp Show resolved Hide resolved
@ante185 ante185 added Ready for merge and removed Change requested A change has been requested, and this can't be merged until it's done. labels Mar 28, 2024
SilenceIsFatto added a commit to SilenceIsFatto/A3-Antistasi-Ultimate that referenced this pull request Mar 30, 2024
@Bob-Murphy Bob-Murphy added this to the 3.5.2 - Reaction Forces milestone Mar 30, 2024
@Bob-Murphy Bob-Murphy merged commit 968a589 into unstable Mar 30, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request Ready for merge Templates Items related to templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants