Fix Conflics for Merging dev/0.8 #849
Merged
Conversation
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
* refactor: fix skybox mirror problem
* fix: change `region` and `pivot` origin to left-bottom
* v0.7.0-beta.4 * Update README.md * Update README.md * Update README.md * Add component denpendent decorator (galacean#796) (galacean#807) * feat: add `dependentComponents` decorator * fix(Renderer): destroy crash when material is null (galacean#808) * Improve BlendShape when use attribute mode (galacean#804) * feat: improve BlendShape when use attribute mode * v0.7.0-beta.5 * refactor: fix skybox mirror problem * fix: fixed the bug of animator revert when blendWeight length exceeds 4 (galacean#817) * fix: fixed the bug of animator revert when blendWeight length exceeds 4 * v0.7.0-beta.6 * refactor: fix shader * fix(text): fix horizontal and vertical alignment error (galacean#772) * fix(text): fix horizontal alignment error Co-authored-by: luzhuang <364439895@qq.com> Co-authored-by: singlecoder <singlecoder2014@gmail.com>
* feat: add `CharacterController` for physX backend
refactor: optimization camera code
* main: v0.7.0-beta.7 refactor: rename (galacean#827) Improve ShaderData Macro feature (galacean#823) refactor: clear import (galacean#825) types: export `BoolUpdateFlag` type (galacean#822) Fix crossFade bug when two AnimatorState use one AnimationClip (galacean#766) fix(text): fix horizontal and vertical alignment error (galacean#772) v0.7.0-beta.6 fix: fixed the bug of animator revert when blendWeight length exceeds 4 (galacean#817) v0.7.0-beta.5 Improve BlendShape when use attribute mode (galacean#804) fix(Renderer): destroy crash when material is null (galacean#808) Add component denpendent decorator (galacean#796) (galacean#807) Update README.md Update README.md Update README.md v0.7.0-beta.4
Merge latest main
…e` to `set` (galacean#844) * feat: refactor `cloneTo` to `copyFrom` for math library * feat: rename `setValue` to `set` for math library
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.