Skip to content

update web submodule for cocos2d-x 3.17 #18775

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

Merged
merged 4 commits into from
Apr 19, 2018
Merged

update web submodule for cocos2d-x 3.17 #18775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2583212
update web subProject, change res
drelaptop Apr 10, 2018
7e8d777
update web spine to 3.6.39
drelaptop Apr 12, 2018
da659ce
update web sub-module
drelaptop Apr 12, 2018
9eb0ef1
update web sub module for spine upgrade to 3.6
drelaptop Apr 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos/scripting/js-bindings/script/jsb_cocos2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

// CCConfig.js
//
cc.ENGINE_VERSION = "Cocos2d-JS v3.16";
cc.ENGINE_VERSION = "Cocos2d-JS v3.17";

cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
Expand Down
2 changes: 1 addition & 1 deletion tests/js-tests/src/tests_resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ var g_tilemaps = [

var g_spine = [
"spine/spineboy.atlas",
"spine/spineboy.json",
"spine/spineboy-ess.json",
"spine/spineboy.png",
"spine/sprite.png",
"spine/goblins.png",
Expand Down
2 changes: 1 addition & 1 deletion web
Open in desktop
Submodule web updated 36 files
+71 −17 CCBoot.js
+12 −12 cocos2d/actions/CCActionInterval.js
+26 −63 cocos2d/core/CCActionManager.js
+2 −2 cocos2d/core/CCDirector.js
+5 −10 cocos2d/core/CCDrawingPrimitivesCanvas.js
+1 −0 cocos2d/core/CCDrawingPrimitivesWebGL.js
+1 −1 cocos2d/core/CCScheduler.js
+2 −3 cocos2d/core/base-nodes/CCNode.js
+2 −0 cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js
+3 −1 cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js
+13 −13 cocos2d/core/platform/CCClass.js
+1 −1 cocos2d/core/platform/CCConfig.js
+2 −0 cocos2d/core/platform/CCEGLView.js
+11 −2 cocos2d/core/platform/CCInputExtension.js
+5 −1 cocos2d/core/platform/CCInputManager.js
+7 −0 cocos2d/core/platform/CCMacro.js
+18 −44 cocos2d/core/renderer/RendererWebGL.js
+1 −1 cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js
+0 −1 cocos2d/core/textures/CCTexture2D.js
+3 −1 cocos2d/core/textures/TexturesWebGL.js
+4 −3 cocos2d/core/utils/BinaryLoader.js
+0 −3 cocos2d/particle/CCParticleBatchNode.js
+6 −5 cocos2d/particle/CCParticleSystemCanvasRenderCmd.js
+4 −1 cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js
+206 −132 cocos2d/shaders/CCGLProgram.js
+27 −52 cocos2d/shaders/CCGLProgramState.js
+1 −1 extensions/ccui/uiwidgets/UIButton.js
+1 −1 extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js
+2 −0 extensions/editbox/CCEditBox.js
+45 −55 extensions/spine/CCSkeleton.js
+17 −8 extensions/spine/CCSkeletonAnimation.js
+209 −192 extensions/spine/CCSkeletonCanvasRenderCmd.js
+6 −7 extensions/spine/CCSkeletonTexture.js
+297 −261 extensions/spine/CCSkeletonWebGLRenderCmd.js
+27 −0 extensions/spine/LICENSE
+1,994 −891 extensions/spine/Spine.js