forked from galacean/engine
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev/1.1' into pr/deth-texture
* 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) ...
- Loading branch information
Showing
154 changed files
with
6,396 additions
and
1,177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
pnpm-lock.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.