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

Add CUP Weapons Compatibility #9599

Merged
merged 9 commits into from
Feb 28, 2024
Merged

Add CUP Weapons Compatibility #9599

merged 9 commits into from
Feb 28, 2024

Conversation

Mike-MF
Copy link
Member

@Mike-MF Mike-MF commented Oct 28, 2023

When merged this pull request will:

  • Merges CUP Weapons Compat from CUP to ACE.

ToDo:

  • Test all of it
  • Figure out what to do with the Laserpointer stuff in original compat
  • Figure out what to do with the displayName in CSW subconfig/magazines/L38 & L49
  • Remove Tabs

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@LinkIsGrim
Copy link
Contributor

laserpointer

Nuke it and convert to engine method like ACE difld

@jonpas
Copy link
Member

jonpas commented Oct 28, 2023

Figure out what to do with the Laserpointer stuff in original compat

Do what you did on CUP. I don't know if we want to remove it from CUP or just modify here though.

@Mike-MF
Copy link
Member Author

Mike-MF commented Oct 28, 2023

Ah, it's a clone of what's done in base CUP already. Mostly just setting the extra modes to scope = 1

@PabstMirror
Copy link
Contributor

will only pass CI on merge (due to changes to workflow)

@acknowledge14
Copy link

Hi, I found something in the old CUP weapons ace compat. In the PVS7 part, some descriptions list below:
// Should have eye cups, but current ACE3 NVG implementation has UI behind
// NVG overlay making it completely hidden if eye cups are enabled
But #9614 has been merged, so will it be OK to set ace_nightvision_eyeCups = 1 for PVS7 now?

@Mike-MF Mike-MF marked this pull request as ready for review November 14, 2023 01:05
@jonpas jonpas added the kind/feature Release Notes: **ADDED:** label Nov 14, 2023
@jonpas jonpas added this to the 3.17.0 milestone Nov 14, 2023
@PabstMirror
Copy link
Contributor

Thoughts on adding a big pop-up warning for duplicate compats?

20240122172101_1

@jonpas
Copy link
Member

jonpas commented Jan 26, 2024

Approved by CUP Team. Their compats will be removed from Workshop on release.

@jonpas jonpas merged commit 147f28d into master Feb 28, 2024
4 of 5 checks passed
@jonpas jonpas deleted the cup_weapons_compat branch February 28, 2024 15:47
@jonpas jonpas modified the milestones: 3.17.0, 3.16.4 Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/compatibility kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants