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.

Sign up for GitHub

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

Jump to bottom

V3.8.1 merge v3.7.4 #15848

Closed
wants to merge 11 commits into from
Closed

V3.8.1 merge v3.7.4 #15848

wants to merge 11 commits into from

Conversation

minggo
Copy link
Contributor

@minggo minggo commented Aug 2, 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.

dogeFu and others added 11 commits May 29, 2023 14:26
@dogeFu
fix: restore downloader limited value (cocos#15107) (cocos#15214)
7f7a55d
@bofeng-song
adapt xmlhttprequest for taobao (cocos#15199) (cocos#15238)
55f7ee6 
(cherry picked from commit 178ab91)
@qiuguohua
Release the listener when destroyed. (cocos#15036) (cocos#15235)
19600db
@mmyduckx
sync:fix mac screen change view not resize bug (cocos#15247)
4021e4a
@zhakesi
optimize the code about spine setting UITransform (cocos#15240)
3585e02
@cocos-robot
[ci skip][AUTO]: Automated code generating update: 2adaa63 (cocos#15247…
590b3ac 
…) (cocos#15248)

Co-authored-by: cocos-robot <[email protected]>
@lealzhan
[fix] physics-2d contact disable not working cocos#15149 (cocos#15158) (
9d6527b 
cocos#15224)

* [fix] physics-2d contact disable not working cocos#15149 (cocos#15158)

* [fix] physics-2d contact disable not working cocos#15149

* tweaks and add docs

* Update i-physics-contact.ts

* tweak

* Update package.json

* Update global-exports.ts 3.7.3-->3.7.4
@cocos-robot
[ci skip][AUTO]: Automated code generating update: 7c6ec18 (cocos#15224…
cba7a64 
…) (cocos#15249)

Co-authored-by: cocos-robot <[email protected]>
@dogeFu
fix : prefab's string array type don't have type info (cocos#15243) (c…
77afe23 
…ocos#15256)
@yanOO1497
update version of sprite meta (cocos#15219)
0673680
@minggo
Merge branch 'v3.7.4' into v3.8.1-merge-v3.7.4
7d9dac2 
 Conflicts:
	cocos/core/global-exports.ts
	cocos/physics-2d/box2d/platform/physics-contact-listener.ts
	cocos/physics-2d/framework/physics-types.ts
	cocos/spine/skeleton.ts
	native/cocos/cocos-version.h
	package.json
@minggo minggo closed this Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lealzhan lealzhan Awaiting requested review from lealzhan

@SantyWang SantyWang Awaiting requested review from SantyWang

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@minggo @dogeFu @bofeng-song @qiuguohua @mmyduckx @zhakesi @cocos-robot @lealzhan @yanOO1497