refine engine prepare #5261
Merged
refine engine prepare #5261
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
jareguo
added a commit
that referenced
this pull request
Aug 28, 2019
…elease * commit '95bb66312892cb63b43c3dff942a221de6fafdb5': refine engine prepare (#5261) space added when atlas calculates next y position. (#5242) fixed animation (#5246) fix scrollview bar display bug (#5249) fixed search skeleton animation clip when no model provided (#5258) fix RenderComponent properties animatable for 2d-tasks/issues/1755 (#5253) fix error when run in wechat develop platform (#5185) (#5248) Optimize the code of BMFont and LetterFont (#5223) Fix getParameter call inside texture update (#5198) refine editbox css-in-js (#5203) improve scrollview inspector panel (#5215) fixed mesh sprite (#5195) add CCView extends EventTarget api (#5205) rm _rotationX and _rotationY (#5197) fix restore rotation invalid (#5188) change comments of code in CCComponentEventHandler and CCSlider (#5178) # Conflicts: # cocos2d/core/mesh/CCMeshRenderer.js # cocos2d/core/renderer/utils/label/bmfont.js # cocos2d/core/renderer/utils/label/letter-font.js # cocos2d/core/renderer/utils/label/ttf.js # cocos2d/core/renderer/utils/utils.js # cocos2d/core/renderer/webgl/assemblers/label/2d/letter.js # cocos2d/core/renderer/webgl/assemblers/label/index.js # cocos2d/core/renderer/webgl/assemblers/sprite/2d/mesh.js # test/qunit/unit-es5/test-serialize-node.js
jareguo
added a commit
that referenced
this pull request
Aug 28, 2019
* v2.2.0-release: (27 commits) add dynamicPack property to texture (#5125) improve cc._throw code (#5208) refine engine prepare (#5261) space added when atlas calculates next y position. (#5242) fixed animation (#5246) fix scrollview bar display bug (#5249) fixed search skeleton animation clip when no model provided (#5258) fix RenderComponent properties animatable for 2d-tasks/issues/1755 (#5253) fix error when run in wechat develop platform (#5185) (#5248) Fix tiledlayer node rebuild bug (#5247) Optimize the code of BMFont and LetterFont (#5223) Fix getParameter call inside texture update (#5198) refine editbox css-in-js (#5203) improve scrollview inspector panel (#5215) fix 2.2.0 opacity dirty bug (#5240) refine find frame index logic (#5220) improve sprite animation performance (#5210) optimize animation (#5211) fixed load sprite fixed mesh sprite (#5195) ... # Conflicts: # cocos2d/core/CCGame.js
jareguo
added a commit
that referenced
this pull request
Aug 28, 2019
* v2.2.0: (63 commits) add dynamicPack property to texture (#5125) improve cc._throw code (#5208) refine engine prepare (#5261) space added when atlas calculates next y position. (#5242) V2.2.0 add gulp task name (#5181) fixed animation (#5246) fix scrollview bar display bug (#5249) fixed search skeleton animation clip when no model provided (#5258) fix RenderComponent properties animatable for 2d-tasks/issues/1755 (#5253) fix error when run in wechat develop platform (#5185) (#5248) Fix tiledlayer node rebuild bug (#5247) Optimize the code of BMFont and LetterFont (#5223) Fix getParameter call inside texture update (#5198) refine editbox css-in-js (#5203) improve scrollview inspector panel (#5215) fix 2.2.0 opacity dirty bug (#5240) add dynamicPack property to texture (#5125) refine find frame index logic (#5220) improve sprite animation performance (#5210) optimize animation (#5211) ... # Conflicts: # cocos2d/core/CCGame.js # cocos2d/core/assets/CCTexture2D.js # cocos2d/core/components/CCLabel.js # cocos2d/core/mesh/CCMesh.js
PPpro
added a commit
to PPpro/engine
that referenced
this pull request
Sep 2, 2019
This reverts commit 95bb663.
jareguo
pushed a commit
that referenced
this pull request
Sep 3, 2019
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.
changeLog:
cc.game.setFrameRate()失败的问题setFrameRate 会生成 debug 信息的 labelAtlas，在这之前应该先加载完内置资源
所以 prepare 流程应该是 prepare -> loadBuiltins -> loadJsList -> prepareFinished
demo iOS_frameRate.zip