-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Merge remote-tracking branch 'cocos-for-editor/v3.8.1' into develop #15703
Commits on Jun 27, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 899a3a9 - Browse repository at this point
Copy the full SHA 899a3a9View commit details -
[AOT] fix type for AOT engine (cocos#15526)
* fix type * fix readonly fix readonly * fix get/set type * fix switch type * fix eslint * update * optimize type in state-machine-eval
Configuration menu - View commit details
-
Copy full SHA for 491c0cf - Browse repository at this point
Copy the full SHA 491c0cfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 64ad3bd - Browse repository at this point
Copy the full SHA 64ad3bdView commit details
Commits on Jun 28, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 2485e4c - Browse repository at this point
Copy the full SHA 2485e4cView commit details -
[AOT] add type for AOT engine (cocos#15527)
* 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
Configuration menu - View commit details
-
Copy full SHA for 4c0f664 - Browse repository at this point
Copy the full SHA 4c0f664View commit details -
[ci skip][AUTO]: Automated code generating update: f10b26a (cocos#15555…
…) (cocos#15556) Co-authored-by: cocos-robot <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for c042d80 - Browse repository at this point
Copy the full SHA c042d80View commit details -
Configuration menu - View commit details
-
Copy full SHA for 620f68e - Browse repository at this point
Copy the full SHA 620f68eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5f71d04 - Browse repository at this point
Copy the full SHA 5f71d04View commit details
Commits on Jun 29, 2023
-
fix: wrong asm.js mem url on minigame platforms (cocos#15559)
* fix: wrong asm.js mem url on Xiaomi platform * revert binaryUrl fix on OPPO platform
Configuration menu - View commit details
-
Copy full SHA for 85acac8 - Browse repository at this point
Copy the full SHA 85acac8View commit details -
fix unlink prefab bug in inspector (cocos#15518)
* 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
Configuration menu - View commit details
-
Copy full SHA for 2ea7043 - Browse repository at this point
Copy the full SHA 2ea7043View commit details -
Configuration menu - View commit details
-
Copy full SHA for 66dca24 - Browse repository at this point
Copy the full SHA 66dca24View commit details -
fix edit material cache editing data bug in inspector (cocos#15550)
* optimize edit material in inspector * update * optimize multiple selections warning label style
Configuration menu - View commit details
-
Copy full SHA for e709534 - Browse repository at this point
Copy the full SHA e709534View commit details -
Configuration menu - View commit details
-
Copy full SHA for eaab2ca - Browse repository at this point
Copy the full SHA eaab2caView commit details -
Add test utils: vec3, quat equality matcher and pseudo random generat…
…or (cocos#15547) * Add test utils: vec3 equality matcher and pseudo random generator * Add Quat jest matcher * Tweak * Update
Configuration menu - View commit details
-
Copy full SHA for a0e3037 - Browse repository at this point
Copy the full SHA a0e3037View commit details -
Configuration menu - View commit details
-
Copy full SHA for 35f6481 - Browse repository at this point
Copy the full SHA 35f6481View commit details -
fix dependency on camera component (cocos#15577)
* fix dependency on camera component * fix problem caused by removed deprecation
Configuration menu - View commit details
-
Copy full SHA for 3b98550 - Browse repository at this point
Copy the full SHA 3b98550View commit details -
Configuration menu - View commit details
-
Copy full SHA for b43f086 - Browse repository at this point
Copy the full SHA b43f086View commit details -
Configuration menu - View commit details
-
Copy full SHA for b104d25 - Browse repository at this point
Copy the full SHA b104d25View commit details -
fix label limit canvas size bug (cocos#15514)
* fix label limit canvas size bug * limit recursion time * fix * fix * move * change * change * name change
Configuration menu - View commit details
-
Copy full SHA for 8e5ea93 - Browse repository at this point
Copy the full SHA 8e5ea93View commit details
Commits on Jun 30, 2023
-
inspector interface: reserve tab style of group; support new section …
…style; (cocos#15586) * reserve tab style of group; support new section style; * add mesh-renderer section group style
Configuration menu - View commit details
-
Copy full SHA for 6acdd0a - Browse repository at this point
Copy the full SHA 6acdd0aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3347d1b - Browse repository at this point
Copy the full SHA 3347d1bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 051368e - Browse repository at this point
Copy the full SHA 051368eView commit details -
Update swig to cocos-v1.1.5 to resolve function name of glue code for…
… overloaded constructor (cocos#15588)
Configuration menu - View commit details
-
Copy full SHA for 324e475 - Browse repository at this point
Copy the full SHA 324e475View commit details -
Revert "[fix] refactor physics2d contact listener (cocos#14026)" (coc…
…os#15564) * Revert "[fix] refactor physics2d contact listener (cocos#14026)" * tweaks
Configuration menu - View commit details
-
Copy full SHA for 7be278d - Browse repository at this point
Copy the full SHA 7be278dView commit details -
Configuration menu - View commit details
-
Copy full SHA for a585edc - Browse repository at this point
Copy the full SHA a585edcView commit details -
fix some bugs in spine webassembly (cocos#15569)
* 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
Configuration menu - View commit details
-
Copy full SHA for a1fa17e - Browse repository at this point
Copy the full SHA a1fa17eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3921bd7 - Browse repository at this point
Copy the full SHA 3921bd7View commit details
Commits on Jul 2, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6d0c1d3 - Browse repository at this point
Copy the full SHA 6d0c1d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for e653f6f - Browse repository at this point
Copy the full SHA e653f6fView commit details
Commits on Jul 3, 2023
-
Configuration menu - View commit details
-
Copy full SHA for cf843a1 - Browse repository at this point
Copy the full SHA cf843a1View commit details -
Fix widget bug in the editor when scale is not 1 (cocos#15545)
* Fix widget bug in the editor when scale is not 1 * fix scale to 0 * change to approx
Configuration menu - View commit details
-
Copy full SHA for ea695c2 - Browse repository at this point
Copy the full SHA ea695c2View commit details -
Fix widget bug in the editor when scale is not 1 (cocos#15602)
* Fix widget bug in the editor when scale is not 1 * fix scale to 0 * change to approx
Configuration menu - View commit details
-
Copy full SHA for e468e99 - Browse repository at this point
Copy the full SHA e468e99View commit details -
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts: cocos/3d/lights/spot-light-component.ts cocos/animation/event/event-emitter.ts cocos/physics-2d/box2d/physics-contact.ts cocos/physics-2d/box2d/physics-world.ts cocos/physics-2d/box2d/platform/physics-contact-listener.ts cocos/physics-2d/builtin/builtin-world.ts cocos/physics/framework/components/constraints/configurable-constraint.ts cocos/spine/assembler/simple.ts cocos/spine/skeleton.ts native/cocos/editor-support/spine-wasm/spine-model.cpp native/cocos/editor-support/spine-wasm/spine-model.h 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/external-config.json
Configuration menu - View commit details
-
Copy full SHA for 7ef995b - Browse repository at this point
Copy the full SHA 7ef995bView commit details -
Merge pull request cocos#15603 from minggo/v3.8.1-merge-v3.8.0
V3.8.1 merge v3.8.0
Configuration menu - View commit details
-
Copy full SHA for bb6131a - Browse repository at this point
Copy the full SHA bb6131aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7f201a0 - Browse repository at this point
Copy the full SHA 7f201a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for ba0d131 - Browse repository at this point
Copy the full SHA ba0d131View commit details
Commits on Jul 4, 2023
-
Configuration menu - View commit details
-
Copy full SHA for e035b23 - Browse repository at this point
Copy the full SHA e035b23View commit details
Commits on Jul 5, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 798e340 - Browse repository at this point
Copy the full SHA 798e340View commit details -
Configuration menu - View commit details
-
Copy full SHA for da0374b - Browse repository at this point
Copy the full SHA da0374bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 85db1c3 - Browse repository at this point
Copy the full SHA 85db1c3View commit details -
All games, mini-programs, and runtime platforms with onWindowResize n…
…eed to listen to it. (cocos#15617) * All games, mini-programs, and runtime platforms with onWindowResize need to listen to it.
Configuration menu - View commit details
-
Copy full SHA for 1d85b94 - Browse repository at this point
Copy the full SHA 1d85b94View commit details -
Configuration menu - View commit details
-
Copy full SHA for 937f80a - Browse repository at this point
Copy the full SHA 937f80aView commit details -
character controller api tweaks (cocos#15621)
* character controller api tweaks * tweak
Configuration menu - View commit details
-
Copy full SHA for 08d9a34 - Browse repository at this point
Copy the full SHA 08d9a34View commit details
Commits on Jul 6, 2023
-
add constrain for wechat logo default ratio (cocos#15627)
* add constrain for wechat logo default ratio
Configuration menu - View commit details
-
Copy full SHA for b3eeaba - Browse repository at this point
Copy the full SHA b3eeabaView commit details -
[fix] physx rigid body sleep issues (cocos#15625)
* [fix] physx rigid body sleep issues * tweaks
Configuration menu - View commit details
-
Copy full SHA for 083e3b2 - Browse repository at this point
Copy the full SHA 083e3b2View commit details -
Tweak deserialization code (cocos#15630)
* Tweak deserialization code
Configuration menu - View commit details
-
Copy full SHA for ff40e74 - Browse repository at this point
Copy the full SHA ff40e74View commit details -
optimize: ensure wasm module ready before importing (cocos#15631)
* optimize: ensure wasm module ready before importing * Update @types/pal/minigame.d.ts * Update pal/wasm/wasm-minigame.ts * use reject instead of warnning * optimize: add promiseToLoadWasmModule * add shouldUseWasmModule method to simplify code * fix: subpackage loading on taobao minigame platform * Update pal/wasm/wasm-minigame.ts
Configuration menu - View commit details
-
Copy full SHA for 649e81a - Browse repository at this point
Copy the full SHA 649e81aView commit details -
Fix the problem that the sound cannot be stopped after calling miniga…
…mePlayer.stop on the Alipay platform. (cocos#15633) * fix audio can not be stopped while call MiniGamePlayer's stop
Configuration menu - View commit details
-
Copy full SHA for 777c855 - Browse repository at this point
Copy the full SHA 777c855View commit details -
Optimize unit test; support overriding constants in per-test-suite (c…
…ocos#15628) * Optimize unit test; support overriding constants in per-test-suite
Configuration menu - View commit details
-
Copy full SHA for a3ee06e - Browse repository at this point
Copy the full SHA a3ee06eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3890600 - Browse repository at this point
Copy the full SHA 3890600View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9421ab1 - Browse repository at this point
Copy the full SHA 9421ab1View commit details -
Configuration menu - View commit details
-
Copy full SHA for acd8e96 - Browse repository at this point
Copy the full SHA acd8e96View commit details
Commits on Jul 7, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 7b5bec1 - Browse repository at this point
Copy the full SHA 7b5bec1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1f45c86 - Browse repository at this point
Copy the full SHA 1f45c86View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73776a0 - Browse repository at this point
Copy the full SHA 73776a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d23520 - Browse repository at this point
Copy the full SHA 8d23520View commit details -
Configuration menu - View commit details
-
Copy full SHA for 14c1237 - Browse repository at this point
Copy the full SHA 14c1237View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9169f73 - Browse repository at this point
Copy the full SHA 9169f73View commit details -
Configuration menu - View commit details
-
Copy full SHA for 308816f - Browse repository at this point
Copy the full SHA 308816fView commit details -
[AOT] fix: crash when setting uniform of particle system (cocos#15639)
* [AOT] fix: crash when setting uniform of particle system * update note
Configuration menu - View commit details
-
Copy full SHA for 79bec57 - Browse repository at this point
Copy the full SHA 79bec57View commit details -
Configuration menu - View commit details
-
Copy full SHA for 99faec0 - Browse repository at this point
Copy the full SHA 99faec0View commit details -
Spine v3.8.0 Fix missing interface bindings (cocos#15618)
* Fix spine replacement skin and animation bone rendering data not refreshed. # Conflicts: # cocos/animation/marionette/graph-eval.ts # cocos/physics/framework/components/constraints/hinge-constraint.ts # cocos/rendering/custom/pipeline.ts # cocos/rendering/custom/private.ts # cocos/rendering/custom/render-graph.ts # cocos/rendering/post-process/passes/forward-pass.ts # cocos/rendering/post-process/passes/forward-transparency-pass.ts # cocos/rendering/post-process/passes/index.ts # cocos/rendering/post-process/passes/tone-mapping-pass.ts # cocos/rendering/post-process/post-process-builder.ts # editor/assets/effects/advanced/leaf.effect # editor/i18n/en/animation.js # editor/i18n/en/localization.js # editor/i18n/zh/animation.js # editor/i18n/zh/localization.js # editor/inspector/assets/fbx/model.js # native/cocos/renderer/pipeline/custom/NativeExecutor.cpp # native/cocos/renderer/pipeline/custom/NativePipeline.cpp # native/cocos/renderer/pipeline/custom/NativePipelineTypes.h # native/cocos/renderer/pipeline/custom/NativeRenderGraph.cpp # native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h * Add bone & IkConstraintData & IkConstraint & PathConstraintData & PathConstraint setter bindings. * Add TrackEntry & AnimationState & Animation setter bindings. * Fix the problem that SkeletonData removal skin and animation are not removed on editor. * fix the problem of skeleton animation delete refresh. * add Skeleton getState interface. * optimize the requestDrawData parameter name & fix get texture by textureID. * add getAttachments * Add slots and atlas mapping hash. * optimize atlas hash code. * parsing atlas from native layer. * rollback to remove the skeleton component of forced refresh. * revert some change * optimize get atlas page index & fix multi-posting texture cache mode does not display. * fix extra space. --------- Co-authored-by: zxx43 <[email protected]> Co-authored-by: santy-wang <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 8ed2ed5 - Browse repository at this point
Copy the full SHA 8ed2ed5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9aaee8c - Browse repository at this point
Copy the full SHA 9aaee8cView commit details
Commits on Jul 10, 2023
-
Configuration menu - View commit details
-
Copy full SHA for cc35a61 - Browse repository at this point
Copy the full SHA cc35a61View commit details -
Configuration menu - View commit details
-
Copy full SHA for f608d98 - Browse repository at this point
Copy the full SHA f608d98View commit details -
fix spine animation does not render in cache mode when total time is …
…0. (cocos#15662) * fix spine animation does not render in cache mode when total time is 0. * fix code format.
Configuration menu - View commit details
-
Copy full SHA for aa9b452 - Browse repository at this point
Copy the full SHA aa9b452View commit details -
export getAttachments (cocos#15661)
* export getAttachments * export getAttachments and other interface * change string to const string&
Configuration menu - View commit details
-
Copy full SHA for fedcfd2 - Browse repository at this point
Copy the full SHA fedcfd2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4b6f482 - Browse repository at this point
Copy the full SHA 4b6f482View commit details -
fix spine STRING_STD2SP function Uncaught RuntimeError: memory access…
… out of bounds. (cocos#15663) Co-authored-by: Santy-Wang <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 89cd677 - Browse repository at this point
Copy the full SHA 89cd677View commit details -
Fix the enumeration order of event types in Wasm (native) and TypeScr…
…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.
Configuration menu - View commit details
-
Copy full SHA for 399e8a1 - Browse repository at this point
Copy the full SHA 399e8a1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 47694d5 - Browse repository at this point
Copy the full SHA 47694d5View commit details -
fix wechat videoplayer pause&stop&play bug (cocos#15668)
* fix wechat videoplayer pause&stop&play bug
Configuration menu - View commit details
-
Copy full SHA for dd55b22 - Browse repository at this point
Copy the full SHA dd55b22View commit details
Commits on Jul 11, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 31b10ff - Browse repository at this point
Copy the full SHA 31b10ffView commit details -
Optimization of user warnings when checking "Use Baked Animation. (co…
…cos#15612) * 勾选use baked animation时的用户警告优化 * 更新 i18n
Configuration menu - View commit details
-
Copy full SHA for 09f83b4 - Browse repository at this point
Copy the full SHA 09f83b4View commit details -
fix problem when skin changed and slot texture changed (cocos#15677)
* fix problem when skin changed and slot texture changed * update external version
Configuration menu - View commit details
-
Copy full SHA for e5d61cf - Browse repository at this point
Copy the full SHA e5d61cfView commit details -
Configuration menu - View commit details
-
Copy full SHA for ddc19f1 - Browse repository at this point
Copy the full SHA ddc19f1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9f03504 - Browse repository at this point
Copy the full SHA 9f03504View commit details -
Revert "remove useless code (cocos#15682)" (cocos#15683)
This reverts commit 9f03504.
Configuration menu - View commit details
-
Copy full SHA for b318b39 - Browse repository at this point
Copy the full SHA b318b39View commit details
Commits on Jul 12, 2023
-
optimize inspector interface when edit node (cocos#15679)
* optimize inspector interface * move up or down component, keep its expand state
Configuration menu - View commit details
-
Copy full SHA for 3c963bb - Browse repository at this point
Copy the full SHA 3c963bbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 57414e2 - Browse repository at this point
Copy the full SHA 57414e2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4b62d5d - Browse repository at this point
Copy the full SHA 4b62d5dView commit details -
PoseGraph: fix apply transform node (cocos#15632)
* Fix apply transform Tweak * Optimize
Configuration menu - View commit details
-
Copy full SHA for 43b9fd4 - Browse repository at this point
Copy the full SHA 43b9fd4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 50d9179 - Browse repository at this point
Copy the full SHA 50d9179View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1aed1fe - Browse repository at this point
Copy the full SHA 1aed1feView commit details -
fixed cocos#15688: [JSB] Assertion was triggered if bind an inner cla…
…ss whose parent is also an inner class (cocos#15689)
Configuration menu - View commit details
-
Copy full SHA for aa53a8b - Browse repository at this point
Copy the full SHA aa53a8bView commit details -
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
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
Configuration menu - View commit details
-
Copy full SHA for 802a1f0 - Browse repository at this point
Copy the full SHA 802a1f0View commit details -
Merge pull request cocos#15692 from cocos/v3.8.1-merge-v3.8.0
V3.8.1 merge v3.8.0
Configuration menu - View commit details
-
Copy full SHA for 85198e3 - Browse repository at this point
Copy the full SHA 85198e3View commit details
Commits on Jul 13, 2023
-
Fix LOD can not work normally while node's active changed dynamically (…
…cocos#15641) * Fix LOD can not work normally while node's active changed dynamically
Configuration menu - View commit details
-
Copy full SHA for 7465cf6 - Browse repository at this point
Copy the full SHA 7465cf6View commit details -
Configuration menu - View commit details
-
Copy full SHA for b826a43 - Browse repository at this point
Copy the full SHA b826a43View commit details -
Merge remote-tracking branch 'cocos-for-editor/v3.8.1' into develop
# Conflicts: # native/cocos/renderer/pipeline/custom/NativeRenderQueue.cpp # native/external-config.json
Configuration menu - View commit details
-
Copy full SHA for 5d75efd - Browse repository at this point
Copy the full SHA 5d75efdView commit details -
update external-config checkout to develop-26
# Conflicts: # native/external-config.json
Configuration menu - View commit details
-
Copy full SHA for 7c51d78 - Browse repository at this point
Copy the full SHA 7c51d78View commit details