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

同步拉取 #17805

Closed
wants to merge 2,052 commits into from
Closed

同步拉取 #17805

wants to merge 2,052 commits into from

Conversation

robinyaogo
Copy link

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.

caryliu1999 and others added 30 commits March 26, 2020 16:19
@caryliu1999
Fix the error when 3d particle prefab run go back in editor. (cocos#6426
91dc75f 
)

* Fix the error when 3d particle prefab run go back in editor.

* refine culling
@PPpro
optimize video downloading (cocos#6429)
1bf50cb
@sunnylanwanjun
optimize 2d particle (cocos#6236)
28f9f22 
* optimize 2d particle

* optimize 2d particle

* optimize 2d particle

* code style

* code style

* annotation
@SantyWang
fix issue that destroy asset twice (cocos#6328)
645e392 
* fix issue that destroy asset twice

* fix that register audio handler failed

* fix preloading

* refine

* refine api docs

* setTexture with a url of image is not supported anymore

* refine

* refine loadNativeFile aviod repeating download

* avoid releasing asset in other bundle

* refine
@zhefengzhang
fixed button effect error when interactable set to false (cocos#6421)
32a27b8
@SantyWang
Revert "fixed button effect error when interactable set to false (coc…
b710bb4 
…os#6421)" (cocos#6431)

This reverts commit 32a27b8.
@finscn
修复bug cocos#6387 (cocos#6415)
8e786c0 
* 修复bug cocos#6387

cocos#6387

* Update blend-func.js

* Update blend-func.js

* Update blend-func.js
@2youyou2
fixed reset assembler (cocos#6434)
9044589
@SantyWang
fixed that texture can not update when there is no image (cocos#6420)
d4f3268 
* fixed that texture can not update when there is no image

* refine
@PatriceJiang
V2.3.3 spine use first skin if default is not set (cocos#6432)
e6204ba 
* spine set default skin

* reform
@jareguo
remove RawAsset (cocos#6286)
d183d22 
* remove raw asset

* polish autoReleaseAssets

* update deprecate info

* update deprecate info

* should call start, update, lateUpdate only if they are functions
@SantyWang
fix ci (cocos#6448)
9a0314d
@caryliu1999
Fix the problem of label cropping on the runtime platform. (cocos#6441)
d617243
@caryliu1999
Modify CANCELLED to CANCELED.
cfba8e2
@knoxHuang
rm mesh module in 3D module (cocos#6456)
6516d13 
* rm mesh module in 3D module

* refine code
@SantyWang
Modify CANCELLED to CANCELED. (cocos#6454)
74bd126
@jareguo
fix unit test
7f6735d
@SantyWang
Merge pull request cocos#6458 from jareguo/v2.4.0
08a10cc 
fix unit test
@knoxHuang
add _reverse to Rotate action
9aea573
@knoxHuang
refine code
80646fc
@knoxHuang
refine code
a07210d
@knoxHuang
refine code
ad48882
@knoxHuang
refine code
ace0585
@PPpro
CHERRY-PICK: fix sys.os match bug (cocos#6466)
17c3366
@knoxHuang
refine code
c91a9a0
@SantyWang
Merge pull request cocos#6464 from knoxHuang/v2.3.3-release
e29f26d 
add _reverse to Rotate action
@SantyWang
refine d.ts (cocos#6470)
befe09a
@PPpro
fix view resize on iOS UC browser
a28d81f
@PPpro
es5
200affb
@PPpro
update
96346f8
xunyi0 and others added 27 commits September 1, 2020 15:46
@xunyi0
Correct the misspelling of TOUCH_MOVE. (cocos#7262)
7576908 
* Correct the misspelling of TOUCH_MOVE.

* Commit changes
@PatriceJiang
Revert "Fix slot can`t update visible property (cocos#6997)" (cocos#7301
a15b912 
)

This reverts commit 46f3c4e.
@knoxHuang
fix widget update when set content size (cocos#7275)
ac51f0a
@jareguo
remove onBatchRestored (cocos#7271)
c87d4f7
@SantyWang
small fixes (cocos#7305)
ef5f5c5
@JayceLai
adapt collision/trigger events (cocos#7302)
10e4350
@jareguo
polish message (cocos#7322)
7cb8a0b
@PPpro
fix audio can't stop when change scene (cocos#7317)
1bc07cb
@knoxHuang
improve page vide code (cocos#7329)
12fd3e0
@xunyi0
Fix some errors in API documentation. (cocos#7315)
0e4dc61 
* Fix some errors in API documentation.

* Commit changes

* Commit changes
@PPpro
fix audio can't play (cocos#7341)
9bfe66f
@SantyWang
throw an error when no image available (cocos#7345)
06136b0 
* throw an error when no image available

* refine
@knoxHuang
fix click video player callback use isPlaying when the pause invalid (…
e047e5f 
…cocos#7372)

* fix click video player callback use isPlaying when the pause invalid

* refine code
@SantyWang
fix set font failed in native (cocos#7380)
1804559 
* fix set font failed in native

* return error when load direct asset failed even assetManager.force is enabled

* Use copy if requests is array
@jareguo
fix prefab revert problem for render component (cocos#7385)
1d1ac25
@SantyWang
refine cache-manager's declaration (cocos#7399)
d3ba980
@yeshao2069
remove unuse param _useOriginalSize(CCLabel/CCEditBox/CCWebView) (coc…
2375e61 
…os#7395)
@SantyWang
record remote server address (cocos#7406)
3513b6e 
* record remote server address

* refine
@finscn
修复uuid的bug (cocos#7423)
7cc1914
@finscn
Adjust debug info message order (cocos#7422)
cb21b74 
调整依据: 
FPS 通常是人么最关系的.
DrawCall 次之.
而三个关于时间的指标 应该放在一起.
@SantyWang
fix memory leaks (cocos#7424)
f70fef2 
* fix memory leaks

* free after uploading

* check bundle before create one

* revert

* revert

* revert
@SantyWang
hack iOS 14 buffer switching mechanism (cocos#7415)
4ae800c 
* hack iOS 14 buffer switching mechanism

* refine

* add description
@SantyWang
typo (cocos#7463)
0f0fae7
@SantyWang
revert cocos#7424 (cocos#7487)
26031bd
@SantyWang
Revert "revert cocos#7424 (cocos#7487)" (cocos#7490)
3dba011 
This reverts commit 26031bd.
@SantyWang
Merge pull request cocos#7491 from cocos-creator/master
105ff92 
Sync master to 2.4
@cocos-robot
Sync branch v2.4.3-release to v2.4.4
27cb574
@robinyaogo robinyaogo closed this Nov 4, 2024
@robinyaogo robinyaogo reopened this Nov 4, 2024
@robinyaogo robinyaogo closed this Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.