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

Develop merge v3.8.2 #16303

Merged
merged 65 commits into from
Sep 22, 2023
Merged

Develop merge v3.8.2 #16303

merged 65 commits into from
Sep 22, 2023

Commits on Aug 31, 2023

  1. Configuration menu
    Copy the full SHA
    442f740 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2b27581 View commit details
    Browse the repository at this point in the history
  3. fix update widget occur error (cocos#16139)

    * fix update widget occur error
    
    * update expression
    arsen2010 authored Aug 31, 2023
    Configuration menu
    Copy the full SHA
    4d21393 View commit details
    Browse the repository at this point in the history
  4. Add openharmony CI support (cocos#16151)

    * Add ci support for Openharmony
    
    * Add ci support for Openharmony
    
    * Update native-compile-platforms.yml
    
    * Update native-compile-platforms.yml
    
    * Update ci yml
    
    * Add executable permission for hvigorw
    
    * Don't output too many log
    
    * test hvigorw now
    
    * Update ci yml
    
    * Update ci yml
    
    * Fix that could not find common/CMakeLists.txt
    
    * build success
    
    * Build hap package
    dumganhar authored Aug 31, 2023
    Configuration menu
    Copy the full SHA
    2b18d25 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. fix web pipeline framebuffer resize issue. (cocos#16157)

    * fix web pipeline framebuffer resize issue.
    
    * fix lint.
    bluesky013 authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    772bfce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e2e4ceb View commit details
    Browse the repository at this point in the history
  3. fix bind cont EventData * bind, modify the address as a reference. (c…

    …ocos#16105)
    
    * fix bind cont EventData * bind, modify the address as a reference.
    
    * change external-config checkout to v3.8.1-19.
    
    * optimize const bind data, use const_cast<Type> & fix spine define api.
    
    * fix wasm api getId & getOffset & <size_t> bones.
    
    * fix wasm & asm const string.
    
    * fix const std::string path to const std::string &path.
    
    * change external-config checkout v3.8.1-19 to v3.8.1-20.
    Canvasfull authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    ba70fe1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    70b7875 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    692d3dc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    eaeab8b View commit details
    Browse the repository at this point in the history
  7. Refactor Openharmony platform code to support switching between napi …

    …(ark js runtime) and v8 (cocos#16093)
    
    * OH could use v8 now.
    
    * napi addon works.
    
    * Use Napi addon to refactor code.
    
    * Fix compilation errors.
    
    * tweak
    
    * Refactor oh platform, remove some hacking for oh.
    
    * Fix log in runScript.
    
    * Fix the issues in napi mode.
    
    * Revert.
    
    * Remove an unused comment.
    
    * Refactor log output in NapiHelper.cpp and OpenHarmonyPlatform.cpp
    
    * Update oh template.
    
    * Remove unused code.
    
    * Remove unused debug log in jsb-gfx.js
    
    * Update include
    
    * Revert Screen::isDisplayStats.
    
    * update OH template for v8 backend
    
    * update
    
    * Update CMakeLists.txt for OH
    
    * Fix a compilation error in NapiHelper.cpp while switching to NAPI mode
    
    * Keep the symbol of entry function.
    
    * Add -Wl,--gc-sections and add -Wl,-s for release mode.
    
    * Update external to 3.8.2-1
    
    * Don't use `console.assert` directly.
    
    * Remove oh specific methods ( getInnerWidth/Height, getWindowHandle ) in Device class.
    
    ---------
    
    Co-authored-by: PP_Pro <[email protected]>
    dumganhar and PPpro authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    d2c3429 View commit details
    Browse the repository at this point in the history
  8. Add openharmony CI support for v3.8.2 branch (cocos#16170)

    * Add openharmony CI support (cocos#16151)
    
    * Add ci support for Openharmony
    
    * Add ci support for Openharmony
    
    * Update native-compile-platforms.yml
    
    * Update native-compile-platforms.yml
    
    * Update ci yml
    
    * Add executable permission for hvigorw
    
    * Don't output too many log
    
    * test hvigorw now
    
    * Update ci yml
    
    * Update ci yml
    
    * Fix that could not find common/CMakeLists.txt
    
    * build success
    
    * Build hap package
    
    * Update oh ci yml, save USE_SE_V8/USE_SE_NAPI to cfg.cmake
    
    * Update oh ci yml
    dumganhar authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    db10a26 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Configuration menu
    Copy the full SHA
    48a5791 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cdca5b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Configuration menu
    Copy the full SHA
    dc933d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    42ff683 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fbbda83 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Configuration menu
    Copy the full SHA
    a45535e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    51dc67e View commit details
    Browse the repository at this point in the history
  3. [fix] box2d wasm rigid-body destroy() should destroy related shapes a…

    …nd joints cocos#17226 (cocos#16154)
    
    * [fix] box2d wasm rigid-body destroy() should destroy related shapes and joints cocos#17226
    
    * update external-config.json
    lealzhan authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    d198a19 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc986c9 View commit details
    Browse the repository at this point in the history
  5. fixed cocos#16190: Compilation errors if using Clang 15 with c++17 si…

    …nce std::unary_function has been removed (cocos#16191)
    
    * fixed cocos#16190: Compilation errors if using Clang 15 with c++17 since std::unary_function has been removed
    
    * Windows doesn't need to define BOOST_NO_CXX98_FUNCTION_BASE since it has already been defined.
    dumganhar authored Sep 6, 2023
    1 Configuration menu
    Copy the full SHA
    4b039cd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    50c2d70 View commit details
    Browse the repository at this point in the history
  7. update world bound when update models (cocos#16189)

    * update world bound
    
    * update code
    moshuying authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    c6d1782 View commit details
    Browse the repository at this point in the history
  8. Modify camera component ortho height's min value to 0 (cocos#16181)

    * Modify camera component ortho height's min value to 0
    
    * Min value as 1e-6
    shrinktofit authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    23a44ed View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. add CULL_MESHOPT constant (cocos#16194)

    * add CULL_MESHOPT constant
    
    * Update cc.config.json
    PPpro authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    0b65ab3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2cb1652 View commit details
    Browse the repository at this point in the history
  3. [v3.8.2] Add workflow_dispatch for oh sdk & vulkan sdk (cocos#16206)

    * Add workflow_dispatch for oh sdk & vulkan sdk
    
    * [ci skip] Update oh sdk cache key to cache-oh-sdk-9
    dumganhar authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    2ed62f7 View commit details
    Browse the repository at this point in the history
  4. Add dirty flag to edit box (cocos#16209)

    * add dirty flag to edit box
    
    Add dirty flag to edit-box-impl in order to save matrix cost while not been focused
    
    * fix CI
    
    ---------
    
    Co-authored-by: chenyang.sun <[email protected]>
    LinYunMo and chenyang.sun authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    7f7de0a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4dbd525 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Configuration menu
    Copy the full SHA
    b57d5ab View commit details
    Browse the repository at this point in the history
  2. Fix SDL-related issues (cocos#16212)

    * 1.Fixed editbox input send message twice.
    2.Fixed when the window is hidden to send message twice
    3.Fixed unresponsive right mouse button
    
    * Remove  redundant files.
    
    * Fixed ios compile failures.
    
    * fixed ci errors for ios
    qiuguohua authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    3822786 View commit details
    Browse the repository at this point in the history
  3. Fix/meshopt (cocos#16200)

    * fix meshopt trigger
    
    * add missing part
    
    * add fallback for platform that doean't support half vertex attr
    
    * fix tidy
    
    * revert wrong code
    
    * correct missing field
    
    * optimize
    
    * tune, fix bug
    yiwenxue authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    b46cba6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4c7d2ce View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5545986 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3c0aaf5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    164aa24 View commit details
    Browse the repository at this point in the history
  8. Merge pull request cocos#16223 from minggo/v3.8.2-merge-v3.8.1

    V3.8.2 merge v3.8.1
    minggo authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    dee8822 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    91ce03d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    df2ce56 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    3287aff View commit details
    Browse the repository at this point in the history
  12. Enable gfx-webgpu ci by default and fix some warnings in gfx-webgpu c…

    …ode (cocos#16231)
    
    * Fix some warnings of gfx-webgpu.
    
    * Move gfx-webgpu compilation to another yml
    
    * Update CMakeLists.txt
    
    * Update webgpu yml
    
    * Fix a mistake in native-compile-webgpu.yml
    
    * Remove unused `#pragma once` for WGPUEMSImpl.cpp
    dumganhar authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    322875e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    794b8b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Fix all warnings for gfx-webgpu and add condition control for webgpu …

    …ci yml (cocos#16232)
    
    * Fix all warnings for gfx-webgpu
    
    * Update webgpu yml, add condition control
    dumganhar authored Sep 11, 2023
    Configuration menu
    Copy the full SHA
    d7f90a3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    290746a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8a6c212 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2788ed6 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

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

Commits on Sep 13, 2023

  1. Configuration menu
    Copy the full SHA
    0e53dde View commit details
    Browse the repository at this point in the history
  2. replace NodeEventType.SIBLING_ORDER_CHANGED with NodeEventType.CHILDR…

    …EN_ORDER_CHANGED (cocos#16246)
    
    * replace NodeEventType.SIBLING_ORDER_CHANGED with NodeEventType.CHILDREN_ORDER_CHANGED
    minggo authored Sep 13, 2023
    Configuration menu
    Copy the full SHA
    ea8ca11 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

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

Commits on Sep 15, 2023

  1. Configuration menu
    Copy the full SHA
    608660a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    59c6afd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5aecd91 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

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

Commits on Sep 19, 2023

  1. Use WebAssembly version libraries for unit testing (cocos#16264)

    * Use WebAssembly version libs in unit test
    shrinktofit authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    5682bbf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c58cb54 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dae0f55 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8366af4 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. fix: gulp-build-h5-source (cocos#16277)

    * fix: gulp-build-h5-source
    
    * update lock
    PPpro authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    f7cf786 View commit details
    Browse the repository at this point in the history
  2. Integration of outline and shadow to label (cocos#16106)

    * Integration of outline and shadow to label
    
    * add test
    
    * change getter/setter
    
    * name change & use assert
    
    * test name change
    
    * name change
    
    * fix
    
    * remove old attribute & add visible
    
    * remove assert
    
    * fix: gulp-build-h5-source
    
    * Revert "fix: gulp-build-h5-source"
    
    ---------
    
    Co-authored-by: PP_Pro <[email protected]>
    LinYunMo and PPpro authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    d2d7623 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'v3.8.1' into v3.8.2-merge-v3.8.1

    Conflicts:
    	cocos/render-scene/scene/submodel.ts
    minggo committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    aa60181 View commit details
    Browse the repository at this point in the history
  4. Merge pull request cocos#16290 from minggo/v3.8.2-merge-v3.8.1

    V3.8.2 merge v3.8.1
    minggo authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    2a44a31 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Merge branch 'v3.8.2' into develop-merge-v3.8.2

     Conflicts:
    	.gitignore
    	cocos/2d/components/deprecated.ts
    	cocos/2d/components/label-outline.ts
    	cocos/2d/components/label.ts
    	cocos/3d/assets/mesh.ts
    cocos/3d/misc/mesh-codec.ts
    	cocos/core/geometry/geometry-native-ext.ts
    cocos/core/settings.ts
    	cocos/gfx/webgpu/webgpu-define.ts
    	cocos/input/input.ts
    	cocos/render-scene/core/pass.ts
    	cocos/rendering/custom/compiler.ts
    	cocos/rendering/custom/executor.ts
    cocos/rendering/custom/pipeline-define.ts
    	cocos/rendering/custom/web-pipeline.ts
    	cocos/rendering/render-additive-light-queue.ts
    	cocos/webgpu/instantiated.ts
    	native/cocos/editor-support/spine-wasm/spine-type-export.cpp
    	native/cocos/platform/SDLHelper.cpp
    	native/cocos/platform/SDLHelper.h
    	native/external-config.json
    	package-lock.json
    	package.json
    	pal/env/src/native/env.ts
    	pal/screen-adapter/native/screen-adapter.ts
    	tests/init.ts
    minggo committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    fca089c View commit details
    Browse the repository at this point in the history
  2. fix compiling error

    minggo committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    9c8bf6d View commit details
    Browse the repository at this point in the history