-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
V3.8.2 merge v3.8.1 #16378
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 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
…) (cocos#16360) Co-authored-by: cocos-robot <[email protected]>
Conflicts: .github/workflows/native-compile-platforms.yml cocos/physics/framework/deprecated.ts cocos/rendering/custom/executor.ts native/cocos/renderer/pipeline/custom/FrameGraphDispatcher.cpp
lealzhan
approved these changes
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 {
|
star-e
approved these changes
Oct 9, 2023
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: