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

cfgSkeletons indentation formatting fixes #6796

Merged

Conversation

TheCandianVendingMachine
Copy link
Contributor

When merged this pull request will:

  • Change all instances of class OFP2_ManSkeleton to correct indentation of bone layout

Copy link
Contributor

@dedmen dedmen left a comment

Choose a reason for hiding this comment

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

I hate that we need so many copies of the same file everywhere...

@jonpas
Copy link
Member

jonpas commented Jan 31, 2019

We could symlink them, git supports that. But there are small differences in each eh?

@dedmen
Copy link
Contributor

dedmen commented Jan 31, 2019

But there are small differences in each eh?

shouldn't. The pivot;Model is different, but that's because some use the samples one which will not be loaded in release version Arma. We should use the path that's always there.

@jokoho48
Copy link
Member

jokoho48 commented Jan 31, 2019

that is wrong @dedmen they should be different in some places where models or Animations have different behavior in that file or a model is referenced in the model.cfg
Gunbag and Tactical Ladder need differences else they would not work

@dedmen
Copy link
Contributor

dedmen commented Jan 31, 2019

they should be different in some places where models or Animations have different behavior in that file or a model is referenced in the model.cfg

Which is not the case here.
Or if that should be the case, it isn't. So I guess it doesn't matter.
Ah I see what you mean. Yeah in addition to the OFP skeleton there are additional entries in the model.cfg's.
How about we just have a header file in Common and just #include that where it's needed?

One difference I just saw is that gunbag,tacticalladder,googles have some names lowercase that are uppercase in Arma 3 samples or other way around.
Are bone names case sensitive or not? Cuz if they are then we have a problem, either the model.cfg's are wrong, or Arma 3 samples is wrong.

I assume our model.cfg's are wrong.

8d6b7de
This is where the uppercase Camera was added, the pivotsModel path is a Arma 2 path! And there is a comment saying the casing was changed in Arma 3. So I guess this is a copy-paste from Arma 2.
So good that this PR will fix that though it doesn't seem to have caused any issues in the past.

@PabstMirror PabstMirror added this to the 3.13.0 milestone Jan 31, 2019
@PabstMirror PabstMirror added the kind/cleanup Release Notes: **CHANGED:** label Jan 31, 2019
@PabstMirror PabstMirror merged commit 639d3fd into acemod:master Feb 1, 2019
@dedmen
Copy link
Contributor

dedmen commented Feb 1, 2019

@PabstMirror what do you think about the idea of putting the OFP skeleton into a single header file in ace common and just including that in the model.cfg? Would create a PR for that.

@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.6 Feb 23, 2019
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* abc

* Revert "abc"

This reverts commit bcb4214.

* Update to current commit

* Fix class OFP2_ManSkeleton to have proper indentation for all bones

* Fix path. Fix whitespace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup Release Notes: **CHANGED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants