File tree
3 files changed
+3
-3
lines changed- cocos/scripting/js-bindings/script
- tests/js-tests/src
3 files changed
+3
-3
lines changedOriginal file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 |
| - | |
| 30 | + | |
31 | 31 |
| |
32 | 32 |
| |
33 | 33 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
724 | 724 |
| |
725 | 725 |
| |
726 | 726 |
| |
727 |
| - | |
| 727 | + | |
728 | 728 |
| |
729 | 729 |
| |
730 | 730 |
| |
|
Submodule web updated 36 files
- CCBoot.js+71-17
- cocos2d/actions/CCActionInterval.js+12-12
- cocos2d/core/CCActionManager.js+26-63
- cocos2d/core/CCDirector.js+2-2
- cocos2d/core/CCDrawingPrimitivesCanvas.js+5-10
- cocos2d/core/CCDrawingPrimitivesWebGL.js+1
- cocos2d/core/CCScheduler.js+1-1
- cocos2d/core/base-nodes/CCNode.js+2-3
- cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js+2
- cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js+3-1
- cocos2d/core/platform/CCClass.js+13-13
- cocos2d/core/platform/CCConfig.js+1-1
- cocos2d/core/platform/CCEGLView.js+2
- cocos2d/core/platform/CCInputExtension.js+11-2
- cocos2d/core/platform/CCInputManager.js+5-1
- cocos2d/core/platform/CCMacro.js+7
- cocos2d/core/renderer/RendererWebGL.js+18-44
- cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js+1-1
- cocos2d/core/textures/CCTexture2D.js-1
- cocos2d/core/textures/TexturesWebGL.js+3-1
- cocos2d/core/utils/BinaryLoader.js+4-3
- cocos2d/particle/CCParticleBatchNode.js-3
- cocos2d/particle/CCParticleSystemCanvasRenderCmd.js+6-5
- cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js+4-1
- cocos2d/shaders/CCGLProgram.js+206-132
- cocos2d/shaders/CCGLProgramState.js+27-52
- extensions/ccui/uiwidgets/UIButton.js+1-1
- extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js+1-1
- extensions/editbox/CCEditBox.js+2
- extensions/spine/CCSkeleton.js+45-55
- extensions/spine/CCSkeletonAnimation.js+17-8
- extensions/spine/CCSkeletonCanvasRenderCmd.js+209-192
- extensions/spine/CCSkeletonTexture.js+6-7
- extensions/spine/CCSkeletonWebGLRenderCmd.js+297-261
- extensions/spine/LICENSE+27
- extensions/spine/Spine.js+2.0k-891
0 commit comments