File tree
4 files changed
+8
-9
lines changed- frameworks
- js-bindings
- bindings/script
- samples/js-tests/src/ExtensionsTest/ScriptTest
4 files changed
+8
-9
lines changedSubmodule cocos2d-html5 updated 22 files
- CCBoot.js+28-5
- CCDebugger.js+1-3
- cocos2d/actions/CCActionInterval.js+8-5
- cocos2d/audio/CCAudio.js+752-1.0k
- cocos2d/clipping-nodes/CCClippingNode.js+1
- cocos2d/core/labelttf/CCLabelTTF.js+20-5
- cocos2d/core/layers/CCLayer.js+9-9
- cocos2d/core/platform/CCEGLView.js+100-40
- cocos2d/core/platform/CCInputManager.js+8-8
- cocos2d/core/platform/CCVisibleRect.js+6-9
- cocos2d/core/renderer/RendererCanvas.js+33-17
- cocos2d/core/scenes/CCLoaderScene.js-1
- cocos2d/core/sprites/CCSprite.js+5-5
- cocos2d/menus/CCMenu.js+11-3
- cocos2d/menus/CCMenuItem.js+2-2
- cocos2d/render-texture/CCRenderTexture.js+2-1
- extensions/ccui/base-classes/UIScale9Sprite.js+12-7
- extensions/ccui/uiwidgets/UICheckBox.js+1-2
- extensions/cocostudio/armature/animation/CCArmatureAnimation.js+2-2
- extensions/cocostudio/reader/timeline/CSLoader.js+7-3
- extensions/gui/control-extension/CCControlSwitch.js+4-3
- extensions/gui/control-extension/CCScale9Sprite.js+1-1
Lines changed: 4 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1512 | 1512 |
| |
1513 | 1513 |
| |
1514 | 1514 |
| |
| 1515 | + | |
1515 | 1516 |
| |
1516 |
| - | |
| 1517 | + | |
1517 | 1518 |
| |
1518 | 1519 |
| |
1519 |
| - | |
1520 | 1520 |
| |
1521 | 1521 |
| |
| 1522 | + | |
1522 | 1523 |
| |
1523 | 1524 |
| |
1524 | 1525 |
| |
| |||
1532 | 1533 |
| |
1533 | 1534 |
| |
1534 | 1535 |
| |
| 1536 | + | |
1535 | 1537 |
| |
1536 | 1538 |
| |
1537 | 1539 |
| |
|
Lines changed: 2 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
128 | 128 |
| |
129 | 129 |
| |
130 | 130 |
| |
131 |
| - | |
132 |
| - | |
133 |
| - | |
134 |
| - | |
| 131 | + | |
135 | 132 |
| |
136 |
| - | |
| 133 | + | |
137 | 134 |
| |
138 | 135 |
| |
139 | 136 |
| |
|
0 commit comments