2youyouo2
|
ca83d6038f
|
fixed crash when create joint
|
2017-03-10 10:01:24 +08:00 |
|
2youyouo2
|
7cc35f458a
|
Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into physics
|
2017-03-08 16:49:58 +08:00 |
|
2youyouo2
|
c278e1cce8
|
support physics binding
|
2017-03-08 14:16:13 +08:00 |
|
pandamicro
|
9c090eb5f6
|
Merge pull request #557 from pandamicro/v1.4
Remove duplicated implementation of setTimeout/setInterval
|
2017-03-06 16:20:10 +08:00 |
|
pandamicro
|
f53775013b
|
Remove duplicated implementation of setTimeout/setInterval
|
2017-03-06 16:07:24 +08:00 |
|
pandamicro
|
9cec0942b3
|
Merge pull request #556 from natural-law/hot-fix
Solve the error that using method Slot::setDisplay in JSB.
|
2017-03-06 11:12:50 +08:00 |
|
zhangbin
|
6c3cdfc5d0
|
Solve the error that using method Slot::setDisplay in JSB.
|
2017-03-06 10:44:00 +08:00 |
|
Wang Nan
|
6463a20295
|
Merge pull request #555 from CocosRobot/update_cocosfiles_1488446294
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-03-06 10:32:39 +08:00 |
|
CocosRobot
|
59dad716cc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-03-02 09:18:15 +00:00 |
|
Wang Nan
|
f3472d70a4
|
Merge pull request #554 from natural-law/issue5342
Solve the error when using DragonBones on native.
|
2017-03-02 17:13:28 +08:00 |
|
zhangbin
|
06e4c3eedf
|
Solve the error when using DragonBones on native.
|
2017-03-02 17:11:31 +08:00 |
|
Wang Nan
|
660b410f2d
|
Merge pull request #553 from natural-law/hot-fix
Update the reference of submodule cocos2d-console.
|
2017-03-02 16:50:48 +08:00 |
|
zhangbin
|
6e2087aa2b
|
Update the reference of submodule cocos2d-console.
Solve the error when using cocos command on Windows.
|
2017-03-02 16:00:38 +08:00 |
|
Wang Nan
|
a385fea200
|
Merge pull request #552 from natural-law/v1.4
Add js binding for the properties of RegionAttachment & MeshAttachment.
|
2017-03-02 11:07:05 +08:00 |
|
zhangbin
|
93be53efed
|
Add js binding for the properties of RegionAttachment & MeshAttachment.
|
2017-03-02 11:04:57 +08:00 |
|
pandamicro
|
74feb46dcb
|
Merge pull request #551 from pandamicro/v1.4
Fix event on heap not removing js proxy issue
|
2017-03-01 22:51:14 +08:00 |
|
pandamicro
|
f52fa57459
|
Fix event on heap not removing js proxy issue
|
2017-03-01 22:32:18 +08:00 |
|
Nan Wang
|
c8c51a910a
|
Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into v1.4
|
2017-02-27 15:06:31 +08:00 |
|
Nan Wang
|
f5ce457f38
|
update version to 1.4.1
|
2017-02-27 15:05:18 +08:00 |
|
Nan Wang
|
f128e1738c
|
merge gen and make simulator task
|
2017-02-27 11:25:54 +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
|
6449f5bec4
|
Merge pull request #542 from natural-law/issue5276
Solve the error when parameter of FileUtils:: fullPathForFilename contains ".."
|
2017-02-27 09:38:50 +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 |
|
Wang Nan
|
54505ece06
|
Merge pull request #536 from natural-law/issue5210
Solve the warning in NDK build with binary/link template.
|
2017-02-27 09:37:00 +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 |
|
zhangbin
|
79f1705ed1
|
Solve the error when parameter of FileUtils:: fullPathForFilename contains ".."
|
2017-02-23 16:53:14 +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
|
7568c95fe2
|
Merge pull request #528 from dumganhar/ws-openssl-support
WebSocket supports wss connections
|
2017-02-20 10:53:11 +08:00 |
|
James Chen
|
8c74aa228a
|
Updates config.json to 25
|
2017-02-20 10:50:08 +08:00 |
|
James Chen
|
779cc28217
|
Sync from https://github.com/cocos2d/cocos2d-x/pull/17381
|
2017-02-20 10:46:28 +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 |
|