Merge Main branch #826
Merged
Merge Main branch #826
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
* feat: add engine settings
* feat: modify physics-related class for editor
* refactor: merge main to dev/0.6
Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com>
Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com>
…alacean#552) * feat: add `StateMachineScript`
* fix: onEndRender trigger error
* feat: add rgbm decode mode
* fix: color space correction
…galacean#560) * feat: change clipTime to normalized as same as transitionTime for more understandable
* feat: support ambient-light replacement Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com> Co-authored-by: GuoLei <gl3336563@163.com>
* feat: adapter oasis editor with ambient light
* fix: use alipay cdn for physx wasm * fix: include wasm files
* fix: the compatibility problem of IOS lower version
# Conflicts: # packages/core/src/animation/Animator.ts # packages/core/src/animation/internal/AnimatorStatePlayData.ts # packages/rhi-webgl/src/WebGLRenderer.ts
* feat: solve math design circular dependency (galacean#488) * feat: solve math design cirular dependency * PhysX based raycast and collider (galacean#505) * feat: add physx version raycast and trigger * feat: add trigger event in script * feat: Add InputManager (galacean#497) * feat: add InputManager * Fix InputManager's Bug which will be triggered when there is no physics engine. (galacean#524) * fix:InputManager modify timing * Lite Physics Package (galacean#522) * feat: add physics lite package * Refactor: split pbr shader (galacean#514) * refactor: pbr shader clean up * feat: add createCapsule in PrimitiveMesh (galacean#515) * feat: add createCapsule in PrimitiveMesh * Feat: support read/write mipmap data from textures and render target (galacean#382) * feat: support render to mip level * feat: support reading from texture with mip level * Feat: hdr runtime (galacean#523) * feat: support IBL HDR Specular * perf: plane horizontal default (galacean#535) * perf(plane): plane horizontal default * fix(plane): fix cull face (galacean#537) * fix(plane): fix uv error (galacean#538) * feat: add more uv channel and color (galacean#548) * Feat: Sprite add clone function. (galacean#532) * feat: sprite add clone function * Add color space (galacean#543) * feat: add engine settings * fix: opt code (galacean#519) * feat: modify physics-related class for editor (galacean#547) * feat: modify physics-related class for editor * Merge main to dev/0.6 (galacean#553) * refactor: merge main to dev/0.6 * fix: bump verison (galacean#557) Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com> * fix: shader error (galacean#556) Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com> * feat/add AnimatorState script for handle animatorState's lifecycle (galacean#552) * feat: add `StateMachineScript` * feat: support skybox with hdr(rgbe) format (galacean#567) * feat: add rgbm decode mode * fix: color space correction (galacean#566) * fix: color space correction * fix: bump version (galacean#568) * feat: change clipTime to normalized as same as transitionTime for mo… (galacean#560) * feat: change clipTime to normalized as same as transitionTime for more understandable * feat: add method: addEvent overload (galacean#559) * feat: support ambient-light replacement (galacean#569) * feat: support ambient-light replacement Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com> Co-authored-by: GuoLei <gl3336563@163.com> * Feat/ambient light adapter editor (galacean#570) * feat: adapter oasis editor with ambient light * feat: add getCurrentAnimatorState API and fix crossfade time (galacean#565) * fix: use alipay cdn for physx wasm (galacean#571) * add wasm file (galacean#572) * fix: use alipay cdn for physx wasm * fix: include wasm files * Fix : the compatibility problem of IOS lower version (galacean#573) * fix: the compatibility problem of IOS lower version Co-authored-by: yangfengzzz <yangfengzzz@hotmail.com> Co-authored-by: AZhan <njktsmshh@163.com> Co-authored-by: zhuxudong <callzhuxudong@163.com> Co-authored-by: JujieX <67930474+JujieX@users.noreply.github.com> Co-authored-by: singlecoder <singlecoder2014@gmail.com> Co-authored-by: shensi.zxd <shensi.zxd@alibaba-inc.com> Co-authored-by: luzhuang <364439895@qq.com>
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
* feat: add `dependentComponents` decorator
* feat: improve BlendShape when use attribute mode
… 4 (galacean#817) * fix: fixed the bug of animator revert when blendWeight length exceeds 4
* fix(text): fix horizontal alignment error
…ean#766) * fix: crossFade bug when two AnimatorState use one AnimationClip galacean#766 Co-authored-by: wz84888 <wz84888@antgroup.com>
* types: export `BoolUpdateFlag` type
* feat: add macros property for ShaderData * fix: fix bug when `enableMacro` and `disableMacro`
GuoLei1990
approved these changes
Jun 10, 2022
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.
Please check if the PR fulfills these requirements
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: