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

Resolve conflicts of #27 (Support animation) #38

Merged
merged 43 commits into from
May 22, 2023

Conversation

faidra
Copy link
Contributor

@faidra faidra commented May 22, 2023

in order to resolve conflicts of #27 , merge master into support_animation

yutopp and others added 30 commits June 23, 2022 16:17
…ials-as-other-mesh

Export mesh with other materials as other mesh
…porterbridge

To be able to use only MaterialExporterBrigde
@faidra faidra changed the title Resolve conflicts of https://github.com/yutopp/VGltf/pull/27 Resolve conflicts of #27 (Support animation) May 22, 2023
@faidra
Copy link
Contributor Author

faidra commented May 22, 2023

it's easy to see the resulting diff with viewing this: master...faidra:VGltf:support_animation

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (support_animation@88bbb31). Click here to learn what that means.
Patch has no changes to coverable lines.

Additional details and impacted files
@@                 Coverage Diff                  @@
##             support_animation      #38   +/-   ##
====================================================
  Coverage                     ?   58.16%           
====================================================
  Files                        ?       23           
  Lines                        ?     1121           
  Branches                     ?      144           
====================================================
  Hits                         ?      652           
  Misses                       ?      420           
  Partials                     ?       49           

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@faidra faidra marked this pull request as draft May 22, 2023 11:42
@yutopp
Copy link
Owner

yutopp commented May 22, 2023

Thank you!

@yutopp yutopp marked this pull request as ready for review May 22, 2023 15:57
@yutopp yutopp merged commit 391651b into yutopp:support_animation May 22, 2023
@yutopp
Copy link
Owner

yutopp commented May 22, 2023

Sorry, I didn't notice that this PR is a draft. If you intended to make more changes, please re-submit PR 🙏

@faidra
Copy link
Contributor Author

faidra commented May 23, 2023

it has been planned to operation check. if it works well, merging has no problem

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants