File tree
22 files changed
+123
-95
lines changed- frameworks
- js-bindings/bindings
- manual
- chipmunk
- network
- script/studio/parsers
- samples/js-tests
- project/proj.wp8-xaml/js-tests
- Assets/Resources/fonts
- src
- GUITest/UIListViewTest
- LabelTest
- templates/js-template-default
- frameworks/runtime-src/proj.wp8-xaml/App
- Assets
- Tiles
- res
22 files changed
+123
-95
lines changedSubmodule cocos2d-html5 updated 17 files
- .gitignore+1
- AUTHORS.txt+11-1
- CCBoot.js+6-3
- cocos2d/core/base-nodes/CCNode.js+1-1
- cocos2d/core/layers/CCLayer.js+3-3
- cocos2d/core/platform/CCConfig.js+1-1
- cocos2d/core/platform/CCEGLView.js+1
- cocos2d/kazmath/vec3.js+4
- cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js+7-7
- extensions/cocostudio/loader/parsers/timelineParser-2.x.js+75-78
- extensions/editbox/CCdomNode.js+1-1
- external/chipmunk/chipmunk.js+2-2
- template/index.html+1-1
- template/main.js+1-1
- template/res/loading.js
- tools/XmlCheck.js+13
- tools/build.xml+2-2
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2556 | 2556 |
| |
2557 | 2557 |
| |
2558 | 2558 |
| |
2559 |
| - | |
2560 |
| - | |
| 2559 | + | |
| 2560 | + | |
2561 | 2561 |
| |
2562 | 2562 |
| |
2563 | 2563 |
| |
|
Lines changed: 4 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
273 | 273 |
| |
274 | 274 |
| |
275 | 275 |
| |
276 |
| - | |
| 276 | + | |
| 277 | + | |
277 | 278 |
| |
278 | 279 |
| |
279 | 280 |
| |
| |||
495 | 496 |
| |
496 | 497 |
| |
497 | 498 |
| |
498 |
| - | |
| 499 | + | |
| 500 | + | |
499 | 501 |
| |
500 | 502 |
| |
501 | 503 |
| |
|
Lines changed: 4 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5165 | 5165 |
| |
5166 | 5166 |
| |
5167 | 5167 |
| |
| 5168 | + | |
| 5169 | + | |
| 5170 | + | |
| 5171 | + | |
5168 | 5172 |
| |
5169 |
| - | |
5170 | 5173 |
| |
5171 | 5174 |
| |
5172 | 5175 |
| |
|
Lines changed: 9 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
50 | 50 |
| |
51 | 51 |
| |
52 | 52 |
| |
53 |
| - | |
54 |
| - | |
55 |
| - | |
| 53 | + | |
56 | 54 |
| |
57 | 55 |
| |
58 | 56 |
| |
| |||
83 | 81 |
| |
84 | 82 |
| |
85 | 83 |
| |
| 84 | + | |
86 | 85 |
| |
| 86 | + | |
| 87 | + | |
| 88 | + | |
87 | 89 |
| |
88 | 90 |
| |
89 | 91 |
| |
| |||
1799 | 1801 |
| |
1800 | 1802 |
| |
1801 | 1803 |
| |
1802 |
| - | |
| 1804 | + | |
| 1805 | + | |
1803 | 1806 |
| |
1804 | 1807 |
| |
1805 | 1808 |
| |
| |||
1809 | 1812 |
| |
1810 | 1813 |
| |
1811 | 1814 |
| |
1812 |
| - | |
| 1815 | + | |
1813 | 1816 |
| |
1814 | 1817 |
| |
1815 | 1818 |
| |
1816 | 1819 |
| |
1817 | 1820 |
| |
| 1821 | + | |
1818 | 1822 |
| |
1819 | 1823 |
| |
1820 | 1824 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
252 | 252 |
| |
253 | 253 |
| |
254 | 254 |
| |
255 |
| - | |
256 |
| - | |
| 255 | + | |
| 256 | + | |
257 | 257 |
| |
258 | 258 |
| |
259 | 259 |
| |
|
Lines changed: 75 additions & 78 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
209 | 209 |
| |
210 | 210 |
| |
211 | 211 |
| |
212 |
| - | |
| 212 | + | |
213 | 213 |
| |
214 | 214 |
| |
215 | 215 |
| |
| |||
219 | 219 |
| |
220 | 220 |
| |
221 | 221 |
| |
222 |
| - | |
| 222 | + | |
223 | 223 |
| |
224 | 224 |
| |
225 | 225 |
| |
226 | 226 |
| |
227 | 227 |
| |
228 | 228 |
| |
229 | 229 |
| |
230 |
| - | |
| 230 | + | |
231 | 231 |
| |
232 | 232 |
| |
233 | 233 |
| |
234 |
| - | |
| 234 | + | |
235 | 235 |
| |
236 | 236 |
| |
237 | 237 |
| |
238 | 238 |
| |
239 | 239 |
| |
240 |
| - | |
| 240 | + | |
241 | 241 |
| |
242 | 242 |
| |
243 | 243 |
| |
244 |
| - | |
| 244 | + | |
245 | 245 |
| |
246 | 246 |
| |
247 | 247 |
| |
248 |
| - | |
| 248 | + | |
249 | 249 |
| |
250 | 250 |
| |
251 | 251 |
| |
| |||
254 | 254 |
| |
255 | 255 |
| |
256 | 256 |
| |
257 |
| - | |
| 257 | + | |
258 | 258 |
| |
259 | 259 |
| |
260 | 260 |
| |
| |||
265 | 265 |
| |
266 | 266 |
| |
267 | 267 |
| |
268 |
| - | |
| 268 | + | |
269 | 269 |
| |
270 | 270 |
| |
271 | 271 |
| |
272 |
| - | |
| 272 | + | |
273 | 273 |
| |
274 | 274 |
| |
275 | 275 |
| |
276 |
| - | |
| 276 | + | |
277 | 277 |
| |
278 | 278 |
| |
279 | 279 |
| |
280 |
| - | |
| 280 | + | |
281 | 281 |
| |
282 | 282 |
| |
283 | 283 |
| |
284 | 284 |
| |
285 | 285 |
| |
286 | 286 |
| |
287 | 287 |
| |
288 |
| - | |
| 288 | + | |
289 | 289 |
| |
290 | 290 |
| |
291 | 291 |
| |
292 |
| - | |
| 292 | + | |
293 | 293 |
| |
294 | 294 |
| |
295 |
| - | |
296 |
| - | |
297 |
| - | |
298 |
| - | |
299 |
| - | |
300 |
| - | |
301 |
| - | |
302 |
| - | |
303 |
| - | |
304 |
| - | |
305 |
| - | |
306 |
| - | |
307 |
| - | |
308 |
| - | |
309 |
| - | |
310 |
| - | |
311 |
| - | |
312 |
| - | |
313 |
| - | |
314 |
| - | |
315 |
| - | |
316 |
| - | |
317 |
| - | |
318 |
| - | |
319 |
| - | |
320 |
| - | |
321 |
| - | |
322 |
| - | |
323 |
| - | |
324 |
| - | |
325 |
| - | |
326 |
| - | |
327 |
| - | |
328 |
| - | |
329 |
| - | |
330 |
| - | |
331 |
| - | |
332 |
| - | |
333 |
| - | |
334 |
| - | |
335 |
| - | |
336 |
| - | |
337 |
| - | |
338 |
| - | |
339 |
| - | |
340 |
| - | |
341 |
| - | |
342 |
| - | |
343 |
| - | |
344 |
| - | |
345 |
| - | |
346 |
| - | |
347 |
| - | |
348 |
| - | |
349 |
| - | |
350 |
| - | |
351 |
| - | |
352 |
| - | |
353 |
| - | |
354 |
| - | |
| 295 | + | |
355 | 296 |
| |
356 |
| - | |
357 |
| - | |
358 |
| - | |
359 |
| - | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
360 | 352 |
| |
| 353 | + | |
361 | 354 |
| |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
362 | 359 |
| |
363 | 360 |
| |
364 | 361 |
| |
|
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
108 | 108 |
| |
109 | 109 |
| |
110 | 110 |
| |
| 111 | + | |
| 112 | + | |
| 113 | + | |
111 | 114 |
| |
112 | 115 |
| |
113 | 116 |
| |
|
Lines changed: 4 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
30 | 30 |
| |
31 | 31 |
| |
32 | 32 |
| |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
33 | 37 |
| |
34 | 38 |
| |
35 | 39 |
| |
|
Lines changed: 8 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1331 | 1331 |
| |
1332 | 1332 |
| |
1333 | 1333 |
| |
1334 |
| - | |
| 1334 | + | |
1335 | 1335 |
| |
1336 | 1336 |
| |
1337 | 1337 |
| |
1338 | 1338 |
| |
1339 | 1339 |
| |
1340 |
| - | |
| 1340 | + | |
1341 | 1341 |
| |
1342 | 1342 |
| |
1343 | 1343 |
| |
| |||
1941 | 1941 |
| |
1942 | 1942 |
| |
1943 | 1943 |
| |
| 1944 | + | |
| 1945 | + | |
1944 | 1946 |
| |
1945 | 1947 |
| |
1946 | 1948 |
| |
| |||
1963 | 1965 |
| |
1964 | 1966 |
| |
1965 | 1967 |
| |
| 1968 | + | |
| 1969 | + | |
1966 | 1970 |
| |
1967 | 1971 |
| |
1968 | 1972 |
| |
| |||
1981 | 1985 |
| |
1982 | 1986 |
| |
1983 | 1987 |
| |
| 1988 | + | |
| 1989 | + | |
1984 | 1990 |
| |
1985 | 1991 |
| |
1986 | 1992 |
| |
|
0 commit comments