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

More JAM stuff #995

Merged
merged 4 commits into from
Oct 2, 2018
Merged

More JAM stuff #995

merged 4 commits into from
Oct 2, 2018

Conversation

Drofseh
Copy link
Contributor

@Drofseh Drofseh commented Sep 29, 2018 •
edited
Loading

When merged this pull request will:

  • Sort #includes and their magwell classes in lexicographical order
  • Put all calibers in their own included .hpp file (except manpad AT and AA launchers, not sure what to do with those yet.
  • add a few new magwell calibers (.38 Special, .357 Mag, .408 Chey Tac, .45 Gap, 6.5 Creedmore, 6.5 Grendal)
  • add magwells for Glock pistols.
  • add 9x18mm Makarov calibre magwells as versions of the same weapons in other calibers.

@Drofseh
Merge remote-tracking branch 'refs/remotes/CBATeam/master'
bf1d886
@Drofseh
Merge remote-tracking branch 'refs/remotes/CBATeam/master'
82a7fe2
@Drofseh
Magwells - sort, add magwells and comments
983d5ea 
- Sort #includes and their magwell classes in lexicographical order
- Put all calibers in their own included .hpp file (except manpad AT and
AA launchers, not sure what to do with those yet.
- add a few new magwell calibers (.38 Special, .357 Mag, .408 Chey Tac,
.45 Gap, 6.5 Creedmore, 6.5 Grendal)
- add magwells for Glock pistols
@Drofseh
Copy link
Contributor Author

Drofseh commented Sep 29, 2018 •
edited
Loading

6.8 SPC and .300 Blackout have previously been using metric designations (CBA_68x43_ACR and CBA_762x35_STANAG respectively).

I only noticed this after I'd added imperial in magwells_300BLK.hpp and magwells_68SPC.hpp.

I've moved the two pre-existing metric classnames to those files so nothing gets broken, but I think we should switch to imperial for those calibers as metric is not commonly used for them.

@Drofseh
add more pistol magwells
ad143d0 
- 7.62x26
- 9x18
- 9x19
- .32 ACP
- .380 ACP
@robalo
Copy link
Contributor

robalo commented Sep 30, 2018

762x39mm in STANAG mag ??

@Drofseh
Copy link
Contributor Author

Drofseh commented Sep 30, 2018

Yup.
https://i.gyazo.com/e2a14060fcf546be454ed40d7f81a1b6.jpg

@commy2 commy2 requested a review from robalo September 30, 2018 08:24
@commy2
Copy link
Contributor

commy2 commented Sep 30, 2018

ref #108

@commy2 commy2 added this to the 3.9 milestone Sep 30, 2018
dedmen
dedmen reviewed Sep 30, 2018
View reviewed changes
addons/jam/magwells_303B.hpp
class CBA_303B_BREN {}; // BREN gun
class CBA_303B_LeeEn {}; // Lee Enfield
Copy link
Contributor

Choose a reason for hiding this comment

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

Just as a side note. We don't really need to shorten names to oblivion. Longer names don't hurt that much

@dedmen
Copy link
Contributor

dedmen commented Sep 30, 2018

I've moved the two pre-existing metric classnames to those files so nothing gets broken, but I think we should switch to imperial for those calibers as metric is not commonly used for them.

I think it's enough to mark them with "deprecated, use X instead" for now.

@robalo
Copy link
Contributor

robalo commented Sep 30, 2018

Wouldn't worry about deprecation much at this point. It's unreleased. Feel free to clean up extra crud.

@dedmen
Copy link
Contributor

dedmen commented Sep 30, 2018

People are already starting to implement it

@Drofseh Drofseh mentioned this pull request Sep 30, 2018
Merged
@commy2 commy2 merged commit fc76d69 into CBATeam:master Oct 2, 2018
@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 2, 2018

@commy2 I hadn't quite pushed the last changes to this PR

@dedmen
Copy link
Contributor

dedmen commented Oct 2, 2018

That's why you mark PR's as WIP :D
But you can take that for hacktoberfest ^^

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 2, 2018

lol, I don't have the ability to add labels to CBA.

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 2, 2018

More changes in #997

@dedmen
Copy link
Contributor

dedmen commented Oct 2, 2018

Not labels.
Just name your PR with [WIP] PR name and then later remove the wip tag from title

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 2, 2018

Ahh, sure, I will do that in future.

@Drofseh Drofseh mentioned this pull request Oct 4, 2018
Merged
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robalo robalo robalo approved these changes

@dedmen dedmen dedmen 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.

None yet
4 participants
@Drofseh @robalo @commy2 @dedmen