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

Cherry pick glTF conflict #1660

Merged
merged 8 commits into from
Jul 24, 2023

Conversation

zhuxudong
Copy link
Member

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

@zhuxudong zhuxudong added this to the 1.1 milestone Jul 24, 2023
@zhuxudong zhuxudong self-assigned this Jul 24, 2023
@codecov
Copy link

codecov bot commented Jul 24, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (fbd5e82) 0.00% compared to head (cd65f91) 0.00%.

❗ Current head cd65f91 differs from pull request most recent head b23aafc. Consider uploading reports for the commit b23aafc to get more accurate results

Additional details and impacted files
@@       Coverage Diff       @@
##   dev/1.1   #1660   +/-   ##
===============================
===============================

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

@GuoLei1990 GuoLei1990 added ignore for release ignore for release bug Something isn't working labels Jul 24, 2023
@GuoLei1990 GuoLei1990 merged commit 462ed1d into galacean:dev/1.1 Jul 24, 2023
5 checks passed
GuoLei1990 added a commit to GuoLei1990/galacean-engine that referenced this pull request Aug 2, 2023
* dev/1.1: (48 commits)
  fix: skin mesh error (galacean#1675)
  fix: test error (galacean#1674)
  test: fix github test (galacean#1669)
  test: fix ci not work (galacean#1670)
  glTF support basisu (galacean#1662)
  fix: `EventDispatcher` static pool bug
  fix: eventdispatcher bug (galacean#1671)
  fix: animation event bug (galacean#1666)
  Shader pass support blend (galacean#1668)
  Fix model mesh advanced data write bug (galacean#1663)
  Cherry pick glTF conflict (galacean#1660)
  Fix worker status set error and can't throw error bug (galacean#1652)
  Fix parse glTF texture wrap & filterMode bug (galacean#1659)
  Add shader lab package and support shader framework (galacean#1610)
  Fix text wrap bug (galacean#1644)
  chore: use strict error msg and type (galacean#1647)
  Fix text error for set text to "" and set enableWrapping to true (galacean#1634)
  "v1.0.0-beta.17"
  Process GLTFBufferParser and GLTFTextureParser pipelines in parallel (galacean#1638)
  Fix animation clip loader, clip change promise to assetPromise, controller json parse (galacean#1506)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working ignore for release ignore for release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants