Merge remote-tracking branch 'cocos-for-editor/v3.8.1' into develop #15703
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
* fix type * fix readonly fix readonly * fix get/set type * fix switch type * fix eslint * update * optimize type in state-machine-eval
* fix object * fix action * fix type in instantiate.ts * fix type for NodeEventProcessor node_event_processor * fix type in input.ts * fix particle system * fix color type * fix CI * add tracking issue
…) (cocos#15556) Co-authored-by: cocos-robot <[email protected]>
* fix: wrong asm.js mem url on Xiaomi platform * revert binaryUrl fix on OPPO platform
* fix unlink prefab button visible bug in inspector * fix multiple unlink prefab nodes，record undo is incorrect * unlink prefab undo has recorded in scene process * optimize code
* optimize edit material in inspector * update * optimize multiple selections warning label style
…or (cocos#15547) * Add test utils: vec3 equality matcher and pseudo random generator * Add Quat jest matcher * Tweak * Update
* fix dependency on camera component * fix problem caused by removed deprecation
* fix label limit canvas size bug * limit recursion time * fix * fix * move * change * change * name change
…style; (cocos#15586) * reserve tab style of group; support new section style; * add mesh-renderer section group style
… overloaded constructor (cocos#15588)
…os#15564) * Revert "[fix] refactor physics2d contact listener (cocos#14026)" * tweaks
* fix blend enum export * fix convert string from ts to sp string * update skeleton data in preload * feature: support change slot texture web * feature: spine change slot texture native * fix set debug render in native * fix some spine asset with no mesh data * fix some interfaces * fix change slot repeat to create middleware textures * fix code style * update external config
update spine wasm
support taa mask
* export getAttachments * export getAttachments and other interface * change string to const string&
… out of bounds. (cocos#15663) Co-authored-by: Santy-Wang <[email protected]>
…ipt interfaces. (cocos#15664) * Fix the issue of aligning the enumeration order of event types in Wasm (native) and TypeScript interfaces. * optimize EventType_Complete order. * fix mapping bindings.
* fix wechat videoplayer pause&stop&play bug
…cos#15612) * 勾选use baked animation时的用户警告优化 * 更新 i18n
* fix problem when skin changed and slot texture changed * update external version
* remove unused data * refine
This reverts commit 9f03504.
* optimize inspector interface * move up or down component, keep its expand state
* Fix apply transform Tweak * Optimize
…ss whose parent is also an inner class (cocos#15689)
Conflicts: cocos/core/utils/x-deprecated.ts cocos/physics/bullet/instantiated.ts cocos/physics/framework/components/character-controllers/character-controller.ts cocos/render-scene/scene/shadows.ts cocos/rendering/render-shadow-map-batched-queue.ts cocos/spine/lib/instantiated.ts cocos/spine/lib/spine-define.ts cocos/spine/skeleton.ts native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h native/cocos/editor-support/spine-wasm/spine-type-export.cpp native/cocos/editor-support/spine-wasm/spine-wasm.cpp native/external-config.json
V3.8.1 merge v3.8.0
…cocos#15641) * Fix LOD can not work normally while node's active changed dynamically
# Conflicts: # native/cocos/renderer/pipeline/custom/NativeRenderQueue.cpp # native/external-config.json
knoxHuang
commented
Jul 13, 2023
native/external-config.json
Outdated
| @@ -3,6 +3,6 @@ | |||
| "type": "github", | |||
| "owner": "cocos-creator", | |||
| "name": "engine-native-external", | |||
| "checkout": "develop-25" | |||
| "checkout": "v3.8.1-4" | |||
There was a problem hiding this comment.
这块是冲突的修改，麻烦看一下是否处理正确
There was a problem hiding this comment.
第三方库需要从 3.8.1 同步到 develop 分支，然后再修改这个值。
# Conflicts: # native/external-config.json
minggo
approved these changes
Jul 13, 2023
|
@star-e i merged first as this PR is easy to conflict. Please send a PR for native/cocos/renderer/pipeline/custom/NativeRenderQueue.cpp if needed. |
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.
Re: #
Changelog
Continuous Integration
This pull request:
Compatibility Check
This pull request: