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.

Sign up for GitHub

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

Jump to bottom

JAM STANAG and 7.62.x51 #997

Merged
merged 9 commits into from
Oct 4, 2018
Merged

JAM STANAG and 7.62.x51 #997

merged 9 commits into from
Oct 4, 2018

Conversation

Drofseh
Copy link
Contributor

@Drofseh Drofseh commented Oct 2, 2018 •
edited
Loading

When merged this pull request will:

This was referenced Oct 2, 2018
Merged
Closed
@Drofseh Drofseh changed the title JAM STANAG and 7.62.x51 [WIP] JAM STANAG and 7.62.x51 Oct 2, 2018
@commy2
Copy link
Contributor

commy2 commented Oct 2, 2018

Sorry, Drofseh. I couldn't tell.

Drofseh added 2 commits October 4, 2018 09:38
@Drofseh
un-deprecate the STANAG 2D XL classes
973b9d9
@Drofseh
minor fix
46cc54a 
- re-add STANAG 2D XL to magazineWell[] for 5.56 rifles
- put correct comment for 5.56 FAMAS mag
@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 4, 2018

Ok, I'm happy with this if @robalo is.

@Drofseh Drofseh changed the title [WIP] JAM STANAG and 7.62.x51 JAM STANAG and 7.62.x51 Oct 4, 2018
@robalo
Copy link
Contributor

robalo commented Oct 4, 2018 via email

commy2
commy2 reviewed Oct 4, 2018
View reviewed changes
addons/jam/magwells_65G.hpp Outdated Show resolved Hide resolved
@commy2
Copy link
Contributor

commy2 commented Oct 4, 2018

Now the indentation of the comments isn't pretty anymore. :(

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 4, 2018

@commy2 all done

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 4, 2018

Ok, comments are aligned.

@robalo
Copy link
Contributor

robalo commented Oct 4, 2018

One more thing, initially I didn't allow the largest twin drums on FN F2000 and Tavors. This commit allows them. I thought my setup was an OK compromise.

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 4, 2018

My bad, I thought they were on all the vanilla rifles originally.
I think your reasoning is correct and I will change them back.

@robalo
Copy link
Contributor

robalo commented Oct 4, 2018

Good work. Go JAM !

@commy2 commy2 added this to the 3.9 milestone Oct 4, 2018
@commy2 commy2 merged commit 0a6c08f into CBATeam:master Oct 4, 2018
ViperMaul added a commit that referenced this pull request Oct 10, 2018
@ViperMaul
Merge branch 'master' into release-candidate-3-9-0
caa53c9 
* master:
  Add Turkish translations (#1002)
  Add french translations for CBA UI (#1001)
  JAM STANAG and 7.62.x51 (#997)
  Remove BOM character from stringtables (#1000)
  More JAM stuff (#995)
  minor last-minute tweaks for AK magwells (#994)
  add CBA_762x39_RPK
  Translate JAM and JR module nams into Polish (#987)
  add magwells for current IFA3, FOW, LEN weapons
  Split/extend the magwell classes by size
@Drofseh Drofseh deleted the JAM-JAM-JAM branch October 13, 2018 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@commy2 commy2 commy2 left review comments

@robalo robalo robalo approved these changes

Assignees
No one assigned
Labels
Enhancement
Projects
None yet
Milestone
3.9
Development

Successfully merging this pull request may close these issues.
3 participants
@Drofseh @commy2 @robalo