zhangbin
|
93be53efed
|
Add js binding for the properties of RegionAttachment & MeshAttachment.
|
2017-03-02 11:04:57 +08:00 |
|
Wang Nan
|
33f0ee177b
|
Merge pull request #549 from hylthink/v1.4
fix http://forum.cocos.com/t/cocos-creator-v1-4-0-hello-world-anysdk/44107/5
|
2017-02-27 09:46:40 +08:00 |
|
Wang Nan
|
1f587520e9
|
Merge pull request #548 from CocosRobot/update_cocosfiles_1488159874
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-27 09:45:52 +08:00 |
|
Wang Nan
|
b8632152b0
|
Merge pull request #550 from CocosRobot/update_cocosfiles_1488159908
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-27 09:45:35 +08:00 |
|
CocosRobot
|
14f096002b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-27 01:45:09 +00:00 |
|
CocosRobot
|
58a5f38c34
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-27 01:44:35 +00:00 |
|
yanli.huang
|
e4eddf819e
|
Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into v1.4
|
2017-02-27 09:43:23 +08:00 |
|
Wang Nan
|
c06e66f5a5
|
Merge pull request #546 from CocosRobot/update_cocosfiles_1488121757
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-27 09:40:22 +08:00 |
|
Wang Nan
|
e660c947f9
|
Merge pull request #543 from natural-law/change-stat
Update the reference of submodule cocos2d-console.
|
2017-02-27 09:40:14 +08:00 |
|
yanli.huang
|
76641928bc
|
fix http://forum.cocos.com/t/cocos-creator-v1-4-0-hello-world-anysdk/44107/5
|
2017-02-27 09:40:12 +08:00 |
|
pandamicro
|
2c4ba9ec2f
|
Merge pull request #547 from pandamicro/v1.4
Add ;
|
2017-02-27 09:39:34 +08:00 |
|
pandamicro
|
3792fd59dc
|
Add ;
|
2017-02-27 09:38:55 +08:00 |
|
Wang Nan
|
3ecc73e462
|
Merge pull request #538 from hylthink/v1.4
fix https://github.com/cocos-creator/fireball/issues/5249
|
2017-02-27 09:37:33 +08:00 |
|
CocosRobot
|
ebde096918
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-26 15:09:17 +00:00 |
|
pandamicro
|
5ac97200b9
|
Merge pull request #545 from pandamicro/v1.4
Fix JSB memory leak and reduce overall memory usage
|
2017-02-26 23:04:27 +08:00 |
|
pandamicro
|
f787cebfb9
|
Reuse js objects for jsb_get_or_create_weak_jsobject, reduce memory usage
|
2017-02-24 18:08:36 +08:00 |
|
pandamicro
|
af7661c0ce
|
Remove useless jsb polyfills to reduce memory usage
|
2017-02-24 18:08:35 +08:00 |
|
pandamicro
|
50d2fc66d3
|
Merge pull request #544 from pandamicro/v1.4
Fix crash issue caused by released NullValue in JSCallbackWrapper
|
2017-02-24 18:06:19 +08:00 |
|
pandamicro
|
1a09c1e408
|
Support exectureGlobalFunction
|
2017-02-24 17:58:40 +08:00 |
|
zhangbin
|
b8a9bb2a74
|
Update the reference of submodule cocos2d-console.
Stat the version of engine but not the version of console.
|
2017-02-24 16:04:12 +08:00 |
|
pandamicro
|
b58e17eb18
|
Fix JSCallbackWrapper crash caused by released NullValue
|
2017-02-23 12:10:31 +08:00 |
|
pandamicro
|
1096e4c2fe
|
Clear pool when restart
|
2017-02-23 12:09:31 +08:00 |
|
Wang Nan
|
a4410d5788
|
Merge pull request #535 from CocosRobot/update_cocosfiles_1486729775
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-17 17:18:28 +08:00 |
|
Wang Nan
|
09172858fc
|
Merge pull request #533 from zilongshanren/fix-bmfont-use-same-texture-issue
fix label ttf resize_height line wrap
|
2017-02-17 17:18:08 +08:00 |
|
yanli.huang
|
2d6c6d60e7
|
fix https://github.com/cocos-creator/fireball/issues/5249
|
2017-02-17 16:00:41 +08:00 |
|
CocosRobot
|
fdf97be719
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-10 12:29:35 +00:00 |
|
Wang Nan
|
bc688f230c
|
Merge pull request #534 from nantas/v1.4
merge V1.4
|
2017-02-10 20:16:15 +08:00 |
|
Nan Wang
|
1dd494d21e
|
Merge branch 'v1.4' of github.com:nantas/cocos2d-x-lite into v1.4
|
2017-02-10 19:00:37 +08:00 |
|
Nan Wang
|
41768d8dda
|
refine gulpfile
|
2017-02-10 18:59:34 +08:00 |
|
Nan Wang
|
770339f0e4
|
add auto-build-src batch file
|
2017-02-10 18:58:43 +08:00 |
|
zilongshanren
|
f422740e91
|
fix label ttf resize_height line wrap
|
2017-02-10 17:59:04 +08:00 |
|
Wang Nan
|
67b1f5d71c
|
Merge pull request #532 from CocosRobot/update_js_bindings_1486720490
[ci skip][AUTO]: updating jsbinding automatically
|
2017-02-10 17:58:25 +08:00 |
|
CocosRobot
|
f78565cbf1
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-02-10 09:57:04 +00:00 |
|
Wang Nan
|
d7eb5fb1b9
|
Merge pull request #531 from natural-law/issue5202
Modify the callback argument of spine event listener.
|
2017-02-10 17:34:27 +08:00 |
|
zhangbin
|
d27bfa164e
|
Modify the callback argument of spine event listener.
Change the argument trackIndex to trackEntry.
|
2017-02-10 17:16:25 +08:00 |
|
Wang Nan
|
e96c7cd9ff
|
Merge pull request #530 from CocosRobot/update_js_bindings_1486715071
[ci skip][AUTO]: updating jsbinding automatically
|
2017-02-10 16:28:17 +08:00 |
|
CocosRobot
|
482b5df3fc
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-02-10 08:26:33 +00:00 |
|
pandamicro
|
e18ffc3370
|
Merge pull request #529 from pandamicro/v1.4
Enhance pointer type conversion
|
2017-02-10 16:21:10 +08:00 |
|
pandamicro
|
9ae7ed8d38
|
Enhance pointer type conversion
|
2017-02-10 16:20:24 +08:00 |
|
pandamicro
|
e40c4ba878
|
Revert connection timeout
|
2017-02-10 14:37:07 +08:00 |
|
Wang Nan
|
c47785c392
|
Merge pull request #527 from natural-law/binary-template-error
Set the default APP_ABI with armeabi-v7a for binary template..
|
2017-02-09 12:03:03 +08:00 |
|
zhangbin
|
4caac936ae
|
Set the default APP_ABI with armeabi-v7a for binary template..
|
2017-02-08 14:22:34 +08:00 |
|
pandamicro
|
350099f88d
|
Merge pull request #526 from pandamicro/v1.4
Fix AssetsManager minor issues
|
2017-02-07 18:21:39 +08:00 |
|
pandamicro
|
988c840945
|
Fix size parsing issue
|
2017-02-07 18:20:20 +08:00 |
|
pandamicro
|
47b5556a63
|
Fix update immediately in checkUpdate callback issue
|
2017-02-07 18:20:12 +08:00 |
|
pandamicro
|
e13815013d
|
Merge pull request #525 from natural-law/hot-fix
Solve the conflict with google-protobuf.
|
2017-02-07 18:19:15 +08:00 |
|
zhangbin
|
d5e3930131
|
Solve the conflict with google-protobuf.
|
2017-02-07 18:15:31 +08:00 |
|
pandamicro
|
a38b0c18bc
|
Merge pull request #524 from pandamicro/v1.4
Revert Network modifications
|
2017-02-06 12:38:44 +08:00 |
|
pandamicro
|
1da6a0e5ae
|
Revert Network modifications
|
2017-02-06 12:37:44 +08:00 |
|
Wang Nan
|
17aa0d5571
|
Merge pull request #523 from natural-law/hot-fix
Update the class SkeletonBatch in spine runtime.
|
2017-02-04 11:36:42 +08:00 |
|