Commit d68e3bc
1 parent a97ebab commit d68e3bc
File tree
38 files changed
+2368
-41
lines changed- cocos
- 2d
- audio
- include
- base
- platform
- android
- java
- libs
- src/org/cocos2dx/lib
- jni
- ios
- linux
- mac
- tizen
- win32
- winrt
38 files changed
+2368
-41
lines changedLines changed: 11 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
423 | 423 |
| |
424 | 424 |
| |
425 | 425 |
| |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
426 | 437 |
| |
427 | 438 |
| |
428 | 439 |
| |
|
Lines changed: 11 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
139 | 139 |
| |
140 | 140 |
| |
141 | 141 |
| |
142 |
| - | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
143 | 153 |
| |
144 | 154 |
| |
145 | 155 |
| |
|
Lines changed: 14 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
57 | 57 |
| |
58 | 58 |
| |
59 | 59 |
| |
| 60 | + | |
60 | 61 |
| |
61 | 62 |
| |
62 | 63 |
| |
| |||
1353 | 1354 |
| |
1354 | 1355 |
| |
1355 | 1356 |
| |
| 1357 | + | |
| 1358 | + | |
| 1359 | + | |
| 1360 | + | |
1356 | 1361 |
| |
1357 | 1362 |
| |
1358 | 1363 |
| |
| |||
1437 | 1442 |
| |
1438 | 1443 |
| |
1439 | 1444 |
| |
| 1445 | + | |
| 1446 | + | |
| 1447 | + | |
| 1448 | + | |
1440 | 1449 |
| |
1441 | 1450 |
| |
1442 | 1451 |
| |
| |||
2262 | 2271 |
| |
2263 | 2272 |
| |
2264 | 2273 |
| |
| 2274 | + | |
| 2275 | + | |
| 2276 | + | |
| 2277 | + | |
| 2278 | + | |
2265 | 2279 |
| |
2266 | 2280 |
| |
2267 | 2281 |
| |
|
Lines changed: 8 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
127 | 127 |
| |
128 | 128 |
| |
129 | 129 |
| |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
130 | 136 |
| |
131 | 137 |
| |
132 | 138 |
| |
| |||
2027 | 2033 |
| |
2028 | 2034 |
| |
2029 | 2035 |
| |
| 2036 | + | |
| 2037 | + | |
2030 | 2038 |
| |
2031 | 2039 |
| |
2032 | 2040 |
| |
|
Lines changed: 26 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
185 | 185 |
| |
186 | 186 |
| |
187 | 187 |
| |
| 188 | + | |
| 189 | + | |
| 190 | + | |
188 | 191 |
| |
189 | 192 |
| |
190 | 193 |
| |
| |||
262 | 265 |
| |
263 | 266 |
| |
264 | 267 |
| |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
265 | 279 |
| |
266 | 280 |
| |
267 | 281 |
| |
| |||
793 | 807 |
| |
794 | 808 |
| |
795 | 809 |
| |
| 810 | + | |
| 811 | + | |
796 | 812 |
| |
797 | 813 |
| |
798 | 814 |
| |
| |||
807 | 823 |
| |
808 | 824 |
| |
809 | 825 |
| |
| 826 | + | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
810 | 832 |
| |
811 | 833 |
| |
812 | 834 |
| |
| |||
839 | 861 |
| |
840 | 862 |
| |
841 | 863 |
| |
| 864 | + | |
| 865 | + | |
842 | 866 |
| |
843 |
| - | |
| 867 | + | |
844 | 868 |
| |
845 | 869 |
| |
846 | 870 |
| |
847 | 871 |
| |
848 | 872 |
| |
849 | 873 |
| |
850 |
| - | |
| 874 | + | |
851 | 875 |
| |
852 | 876 |
| |
853 | 877 |
| |
|
Lines changed: 17 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
250 | 250 |
| |
251 | 251 |
| |
252 | 252 |
| |
253 |
| - | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
254 | 258 |
| |
255 | 259 |
| |
256 | 260 |
| |
| |||
815 | 819 |
| |
816 | 820 |
| |
817 | 821 |
| |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
| 827 | + | |
| 828 | + | |
818 | 829 |
| |
819 | 830 |
| |
820 | 831 |
| |
| |||
904 | 915 |
| |
905 | 916 |
| |
906 | 917 |
| |
| 918 | + | |
| 919 | + | |
| 920 | + | |
907 | 921 |
| |
908 | 922 |
| |
909 | 923 |
| |
| |||
971 | 985 |
| |
972 | 986 |
| |
973 | 987 |
| |
| 988 | + | |
| 989 | + | |
974 | 990 |
| |
975 | 991 |
| |
976 | 992 |
| |
|
Lines changed: 36 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
66 | 66 |
| |
67 | 67 |
| |
68 | 68 |
| |
| 69 | + | |
69 | 70 |
| |
70 | 71 |
| |
71 | 72 |
| |
| |||
190 | 191 |
| |
191 | 192 |
| |
192 | 193 |
| |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
193 | 199 |
| |
194 | 200 |
| |
195 | 201 |
| |
| |||
525 | 531 |
| |
526 | 532 |
| |
527 | 533 |
| |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
528 | 540 |
| |
529 | 541 |
| |
530 | 542 |
| |
| |||
550 | 562 |
| |
551 | 563 |
| |
552 | 564 |
| |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + |
Lines changed: 17 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
292 | 292 |
| |
293 | 293 |
| |
294 | 294 |
| |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
295 | 310 |
| |
296 | 311 |
| |
297 | 312 |
| |
| |||
348 | 363 |
| |
349 | 364 |
| |
350 | 365 |
| |
| 366 | + | |
| 367 | + | |
351 | 368 |
| |
352 | 369 |
| |
353 | 370 |
| |
|
0 commit comments