File tree
3 files changed
+17
-17
lines changed- frameworks
- js-bindings/bindings/script
3 files changed
+17
-17
lines changedSubmodule cocos2d-html5 updated 28 files
- AUTHORS.txt+2
- CHANGELOG.txt+31
- cocos2d/core/base-nodes/CCNode.js+2-3
- cocos2d/core/layers/CCLayer.js+4-4
- cocos2d/core/renderer/RendererCanvas.js+31-6
- cocos2d/core/renderer/RendererWebGL.js+31-9
- cocos2d/render-texture/CCRenderTexture.js+4-4
- cocos2d/tilemap/CCTMXLayer.js+5-4
- extensions/ccui/base-classes/CCProtectedNode.js+1-1
- extensions/ccui/base-classes/UIScale9Sprite.js+2-2
- extensions/ccui/layouts/UIHBox.js+1-1
- extensions/ccui/layouts/UILayoutParameter.js+1-1
- extensions/ccui/layouts/UIVBox.js+1-1
- extensions/ccui/uiwidgets/UIButton.js+1-1
- extensions/ccui/uiwidgets/UICheckBox.js+1-1
- extensions/ccui/uiwidgets/UIImageView.js+1-1
- extensions/ccui/uiwidgets/UIRichText.js+2-2
- extensions/ccui/uiwidgets/UIText.js+1-1
- extensions/ccui/uiwidgets/UITextAtlas.js+1-1
- extensions/cocostudio/reader/timeline/ActionTimeline.js+1-1
- extensions/cocostudio/reader/widgetreader/LabelReader/LabelReader.js+1-1
- extensions/cocostudio/reader/widgetreader/LayoutReader/LayoutReader.js+1-1
- extensions/cocostudio/reader/widgetreader/ListViewReader/ListViewReader.js+2-4
- extensions/cocostudio/reader/widgetreader/PageViewReader/PageViewReader.js+1-1
- extensions/cocostudio/reader/widgetreader/ScrollViewReader/ScrollViewReader.js+4-4
- extensions/cocostudio/reader/widgetreader/TextFieldReader/TextFieldReader.js+2-2
- extensions/cocostudio/reader/widgetreader/WidgetReader.js+2-2
- extensions/gui/control-extension/CCScale9Sprite.js+2-2
Lines changed: 7 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
348 | 348 |
| |
349 | 349 |
| |
350 | 350 |
| |
351 |
| - | |
| 351 | + | |
352 | 352 |
| |
353 | 353 |
| |
354 | 354 |
| |
| |||
447 | 447 |
| |
448 | 448 |
| |
449 | 449 |
| |
450 |
| - | |
| 450 | + | |
451 | 451 |
| |
452 | 452 |
| |
453 | 453 |
| |
454 | 454 |
| |
455 |
| - | |
| 455 | + | |
456 | 456 |
| |
457 | 457 |
| |
458 | 458 |
| |
| |||
534 | 534 |
| |
535 | 535 |
| |
536 | 536 |
| |
537 |
| - | |
| 537 | + | |
538 | 538 |
| |
539 | 539 |
| |
540 | 540 |
| |
| |||
597 | 597 |
| |
598 | 598 |
| |
599 | 599 |
| |
600 |
| - | |
| 600 | + | |
601 | 601 |
| |
602 | 602 |
| |
603 | 603 |
| |
| |||
819 | 819 |
| |
820 | 820 |
| |
821 | 821 |
| |
822 |
| - | |
| 822 | + | |
823 | 823 |
| |
824 | 824 |
| |
825 | 825 |
| |
826 | 826 |
| |
827 | 827 |
| |
828 | 828 |
| |
829 |
| - | |
| 829 | + | |
830 | 830 |
| |
831 | 831 |
| |
832 | 832 |
| |
|
Lines changed: 9 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
92 | 92 |
| |
93 | 93 |
| |
94 | 94 |
| |
95 |
| - | |
| 95 | + | |
96 | 96 |
| |
97 | 97 |
| |
98 | 98 |
| |
| |||
158 | 158 |
| |
159 | 159 |
| |
160 | 160 |
| |
161 |
| - | |
| 161 | + | |
162 | 162 |
| |
163 | 163 |
| |
164 | 164 |
| |
165 |
| - | |
| 165 | + | |
166 | 166 |
| |
167 | 167 |
| |
168 | 168 |
| |
| |||
181 | 181 |
| |
182 | 182 |
| |
183 | 183 |
| |
184 |
| - | |
| 184 | + | |
185 | 185 |
| |
186 | 186 |
| |
187 | 187 |
| |
188 |
| - | |
| 188 | + | |
189 | 189 |
| |
190 | 190 |
| |
191 | 191 |
| |
192 |
| - | |
| 192 | + | |
193 | 193 |
| |
194 | 194 |
| |
195 | 195 |
| |
196 |
| - | |
| 196 | + | |
197 | 197 |
| |
198 | 198 |
| |
199 | 199 |
| |
| |||
205 | 205 |
| |
206 | 206 |
| |
207 | 207 |
| |
208 |
| - | |
| 208 | + | |
209 | 209 |
| |
210 | 210 |
| |
211 | 211 |
| |
| |||
222 | 222 |
| |
223 | 223 |
| |
224 | 224 |
| |
225 |
| - | |
| 225 | + | |
226 | 226 |
| |
227 | 227 |
| |
228 | 228 |
| |
|
0 commit comments