Skip to content
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

Merged
merged 91 commits into from
Jul 13, 2023

Commits on Jun 27, 2023

  1. Configuration menu
    Copy the full SHA
    899a3a9 View commit details
    Browse the repository at this point in the history
  2. [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
    PPpro authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    491c0cf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    64ad3bd View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Configuration menu
    Copy the full SHA
    2485e4c View commit details
    Browse the repository at this point in the history
  2. [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
    PPpro authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    4c0f664 View commit details
    Browse the repository at this point in the history
  3. [ci skip][AUTO]: Automated code generating update: f10b26a (cocos#15555

    …) (cocos#15556)
    
    Co-authored-by: cocos-robot <[email protected]>
    cocos-robot and cocos-robot authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    c042d80 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    620f68e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5f71d04 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. 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
    PPpro authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    85acac8 View commit details
    Browse the repository at this point in the history
  2. 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
    arsen2010 authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    2ea7043 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    66dca24 View commit details
    Browse the repository at this point in the history
  4. fix edit material cache editing data bug in inspector (cocos#15550)

    * optimize edit material in inspector
    
    * update
    
    * optimize multiple selections warning label style
    arsen2010 authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    e709534 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    eaab2ca View commit details
    Browse the repository at this point in the history
  6. 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
    shrinktofit authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    a0e3037 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    35f6481 View commit details
    Browse the repository at this point in the history
  8. fix dependency on camera component (cocos#15577)

    * fix dependency on camera component
    
    * fix problem caused by removed deprecation
    star-e authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    3b98550 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b43f086 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    b104d25 View commit details
    Browse the repository at this point in the history
  11. fix label limit canvas size bug (cocos#15514)

    * fix label limit canvas size bug
    
    * limit recursion time
    
    * fix
    
    * fix
    
    * move
    
    * change
    
    * change
    
    * name change
    LinYunMo authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    8e5ea93 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. 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
    arsen2010 authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    6acdd0a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3347d1b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    051368e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    324e475 View commit details
    Browse the repository at this point in the history
  5. Revert "[fix] refactor physics2d contact listener (cocos#14026)" (coc…

    …os#15564)
    
    * Revert "[fix] refactor physics2d contact listener (cocos#14026)"
    
    * tweaks
    lealzhan authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7be278d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a585edc View commit details
    Browse the repository at this point in the history
  7. 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
    zhakesi authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    a1fa17e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3921bd7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. Configuration menu
    Copy the full SHA
    6d0c1d3 View commit details
    Browse the repository at this point in the history
  2. Update external-config.json (cocos#15598)

    update spine wasm
    SantyWang authored Jul 2, 2023
    Configuration menu
    Copy the full SHA
    e653f6f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. support taa mask (cocos#15592)

    support taa mask
    2youyou2 authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    cf843a1 View commit details
    Browse the repository at this point in the history
  2. 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
    LinYunMo authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ea695c2 View commit details
    Browse the repository at this point in the history
  3. 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
    LinYunMo authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    e468e99 View commit details
    Browse the repository at this point in the history
  4. 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
    minggo committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    7ef995b View commit details
    Browse the repository at this point in the history
  5. Merge pull request cocos#15603 from minggo/v3.8.1-merge-v3.8.0

    V3.8.1 merge v3.8.0
    minggo authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    bb6131a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7f201a0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ba0d131 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Configuration menu
    Copy the full SHA
    e035b23 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Configuration menu
    Copy the full SHA
    798e340 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    da0374b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    85db1c3 View commit details
    Browse the repository at this point in the history
  4. 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.
    bofeng-song authored Jul 5, 2023
    Configuration menu
    Copy the full SHA
    1d85b94 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    937f80a View commit details
    Browse the repository at this point in the history
  6. character controller api tweaks (cocos#15621)

    * character controller api tweaks
    
    * tweak
    lealzhan authored Jul 5, 2023
    Configuration menu
    Copy the full SHA
    08d9a34 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. add constrain for wechat logo default ratio (cocos#15627)

    * add constrain for wechat logo default ratio
    mmyduckx authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    b3eeaba View commit details
    Browse the repository at this point in the history
  2. [fix] physx rigid body sleep issues (cocos#15625)

    * [fix] physx rigid body sleep issues
    
    * tweaks
    lealzhan authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    083e3b2 View commit details
    Browse the repository at this point in the history
  3. Tweak deserialization code (cocos#15630)

    * Tweak deserialization code
    shrinktofit authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    ff40e74 View commit details
    Browse the repository at this point in the history
  4. 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
    PPpro authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    649e81a View commit details
    Browse the repository at this point in the history
  5. 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
    bofeng-song authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    777c855 View commit details
    Browse the repository at this point in the history
  6. Optimize unit test; support overriding constants in per-test-suite (c…

    …ocos#15628)
    
    * Optimize unit test; support overriding constants in per-test-suite
    shrinktofit authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    a3ee06e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3890600 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9421ab1 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    acd8e96 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Configuration menu
    Copy the full SHA
    7b5bec1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1f45c86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    73776a0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8d23520 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    14c1237 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9169f73 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    308816f View commit details
    Browse the repository at this point in the history
  8. [AOT] fix: crash when setting uniform of particle system (cocos#15639)

    * [AOT] fix: crash when setting uniform of particle system
    
    * update note
    PPpro authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    79bec57 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    99faec0 View commit details
    Browse the repository at this point in the history
  10. 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]>
    3 people authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    8ed2ed5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    9aaee8c View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Configuration menu
    Copy the full SHA
    cc35a61 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f608d98 View commit details
    Browse the repository at this point in the history
  3. 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.
    Canvasfull authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    aa9b452 View commit details
    Browse the repository at this point in the history
  4. export getAttachments (cocos#15661)

    * export getAttachments
    
    * export getAttachments and other interface
    
    * change string to const string&
    SantyWang authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    fedcfd2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4b6f482 View commit details
    Browse the repository at this point in the history
  6. fix spine STRING_STD2SP function Uncaught RuntimeError: memory access…

    … out of bounds. (cocos#15663)
    
    Co-authored-by: Santy-Wang <[email protected]>
    Canvasfull and SantyWang authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    89cd677 View commit details
    Browse the repository at this point in the history
  7. 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.
    Canvasfull authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    399e8a1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    47694d5 View commit details
    Browse the repository at this point in the history
  9. fix wechat videoplayer pause&stop&play bug (cocos#15668)

    * fix wechat videoplayer pause&stop&play bug
    mmyduckx authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    dd55b22 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Configuration menu
    Copy the full SHA
    31b10ff View commit details
    Browse the repository at this point in the history
  2. Optimization of user warnings when checking "Use Baked Animation. (co…

    …cos#15612)
    
    * 勾选use baked animation时的用户警告优化
    
    * 更新 i18n
    knoxHuang authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    09f83b4 View commit details
    Browse the repository at this point in the history
  3. fix problem when skin changed and slot texture changed (cocos#15677)

    * fix problem when skin changed and slot texture changed
    
    * update external version
    SantyWang authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    e5d61cf View commit details
    Browse the repository at this point in the history
  4. Remove useless code (cocos#15670)

    * remove unused data
    
    * refine
    SantyWang authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ddc19f1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9f03504 View commit details
    Browse the repository at this point in the history
  6. Revert "remove useless code (cocos#15682)" (cocos#15683)

    This reverts commit 9f03504.
    SantyWang authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b318b39 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. optimize inspector interface when edit node (cocos#15679)

    * optimize inspector interface
    
    * move up or down component, keep its expand state
    arsen2010 authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    3c963bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    57414e2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4b62d5d View commit details
    Browse the repository at this point in the history
  4. PoseGraph: fix apply transform node (cocos#15632)

    * Fix apply transform
    
    Tweak
    
    * Optimize
    shrinktofit authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    43b9fd4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    50d9179 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1aed1fe View commit details
    Browse the repository at this point in the history
  7. fixed cocos#15688: [JSB] Assertion was triggered if bind an inner cla…

    …ss whose parent is also an inner class (cocos#15689)
    dumganhar authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    aa53a8b View commit details
    Browse the repository at this point in the history
  8. 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
    minggo committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    802a1f0 View commit details
    Browse the repository at this point in the history
  9. Merge pull request cocos#15692 from cocos/v3.8.1-merge-v3.8.0

    V3.8.1 merge v3.8.0
    minggo authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    85198e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. 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
    bofeng-song authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    7465cf6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b826a43 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'cocos-for-editor/v3.8.1' into develop

    # Conflicts:
    #	native/cocos/renderer/pipeline/custom/NativeRenderQueue.cpp
    #	native/external-config.json
    knoxHuang committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    5d75efd View commit details
    Browse the repository at this point in the history
  4. update external-config checkout to develop-26

    # Conflicts:
    #	native/external-config.json
    knoxHuang committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    7c51d78 View commit details
    Browse the repository at this point in the history