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

V3.8.2 merge v3.8.1 #16378

Merged
merged 13 commits into from
Oct 9, 2023
Merged

V3.8.2 merge v3.8.1 #16378

merged 13 commits into from
Oct 9, 2023

Conversation

minggo
Copy link
Contributor

@minggo minggo commented Oct 9, 2023

Re: #

Changelog


Continuous Integration

This pull request:

  • needs automatic test cases check.

    Manual trigger with @cocos-robot run test cases afterward.

  • does not change any runtime related code or build configuration

    If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.


Compatibility Check

This pull request:

  • changes public API, and have ensured backward compatibility with deprecated features.
  • affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
  • affects file structure of the build package or build configuration which requires user project upgrade.
  • introduces breaking changes, please list all changes, affected features and the scope of violation.

yiwenxue and others added 12 commits September 20, 2023 21:31
)

* Fix crash in __cxx_global_var_init if using Xcode 15 and targeting <= iOS 14

* fixed cocos#16190: Compilation errors if using Clang 15 with c++17 since 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.
…6320)

* 1.Rules for modifying configuration changes
2.Update app name

* Modify variable name
* Fix ndk version in ci script

* Fix typo of ANDROID_NDK in ci script

* Update ci script, free space for android build

* Don't clear android tools
* fix: load script packages before loading builtin assets

* fix eslint

* fix ci

* Revert "fix ci"

This reverts commit 3858472.

* add errorID logID
 Conflicts:
	.github/workflows/native-compile-platforms.yml
	cocos/physics/framework/deprecated.ts
	cocos/rendering/custom/executor.ts
	native/cocos/renderer/pipeline/custom/FrameGraphDispatcher.cpp
@minggo minggo requested review from lealzhan and star-e October 9, 2023 06:17
@github-actions
Copy link

github-actions bot commented Oct 9, 2023

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -136,11 +136,11 @@
          */
         ENABLE_WEBGL_ANTIALIAS: boolean;
         /**
          * @en
-         * Used to set float output, the default value is false.
+         * Used to set float output render target, more accurate multiple light sources, fog, and translucent effects, custom pipeline only, the default value is false.
          * @zh
-         * 用于开启浮点格式的输出, 默认值为 false。
+         * 用于开启浮点格式的RT输出, 更精确的多光源、雾化和半透明效果, 仅用于自定义管线, 默认值为 false。
          * @default false
          */
         ENABLE_FLOAT_OUTPUT: boolean;
         /**
@@ -49662,28 +49662,20 @@
              */
             HINGE = 1,
             /**
              * @en
-             * Cone twist constraint.
-             * @zh
-             * 锥形扭转约束。
-             * @deprecated coneTwist is deprecated, please use configurable instead
-             */
-            CONE_TWIST = 2,
-            /**
-             * @en
              * Fixed constraint.
              * @zh
              * 固定约束。
              */
-            FIXED = 3,
+            FIXED = 2,
             /**
              * @en
              * Configurable constraint.
              * @zh
              * 可配置约束。
              */
-            CONFIGURABLE = 4
+            CONFIGURABLE = 3
         }
         /**
          * @en
          * Constraint Mode for degrees of freedom.
@@ -66683,12 +66675,8 @@
         export interface _cocos_physics_spec_i_character_controller__ICapsuleCharacterController extends _cocos_physics_spec_i_character_controller__IBaseCharacterController {
             setRadius(value: number): void;
             setHeight(value: number): void;
         }
-        /**
-         * @deprecated ConeTwistConstraint is deprecated, please use ConfigurableConstraint instead
-         */
-        export type _cocos_physics_spec_i_physics_constraint__IConeTwistConstraint = _cocos_physics_spec_i_physics_constraint__IBaseConstraint;
         export interface _cocos_physics_framework_physics_selector__IPhysicsWrapperObject {
             PhysicsWorld?: _types_globals__Constructor<_cocos_physics_spec_i_physics_world__IPhysicsWorld>;
             RigidBody?: _types_globals__Constructor<_cocos_physics_spec_i_rigid_body__IRigidBody>;
             BoxCharacterController?: _types_globals__Constructor<_cocos_physics_spec_i_character_controller__IBoxCharacterController>;
@@ -66703,12 +66691,8 @@
             SimplexShape?: _types_globals__Constructor<_cocos_physics_spec_i_physics_shape__ISimplexShape>;
             PlaneShape?: _types_globals__Constructor<_cocos_physics_spec_i_physics_shape__IPlaneShape>;
             PointToPointConstraint?: _types_globals__Constructor<_cocos_physics_spec_i_physics_constraint__IPointToPointConstraint>;
             HingeConstraint?: _types_globals__Constructor<_cocos_physics_spec_i_physics_constraint__IHingeConstraint>;
-            /**
-             * @deprecated cone twist constraint is deprecated, please use configurable instead
-             */
-            ConeTwistConstraint?: _types_globals__Constructor<_cocos_physics_spec_i_physics_constraint__IConeTwistConstraint>;
             FixedConstraint?: _types_globals__Constructor<_cocos_physics_spec_i_physics_constraint__IFixedConstraint>;
             ConfigurableConstraint?: _types_globals__Constructor<_cocos_physics_spec_i_physics_constraint__IConfigurableConstraint>;
         }
         export interface _cocos_physics_framework_physics_selector__IPhysicsBackend {

* fix web

* fix fg dispatcher
@minggo minggo merged commit 5465d2b into cocos:v3.8.2 Oct 9, 2023
23 checks passed
@minggo minggo deleted the v3.8.2-merge-v3.8.1 branch October 9, 2023 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.