Commit Graph

282 Commits

Author SHA1 Message Date
2youyouo2 f178b8e759 add fractions to raycast callback 2017-03-17 14:43:58 +08:00
2youyouo2 594075ec69 fixed physics jsbinding 2017-03-15 11:09:59 +08:00
2youyouo2 e8467cde8b Merge branch 'physics' of github.com:2youyouo2/cocos2d-x-lite into physics 2017-03-14 16:38:17 +08:00
2youyouo2 ca07dc5968 remove unused log 2017-03-14 16:37:47 +08:00
2youyou2 fc7de34ab0 fixed windows physics compile error 2017-03-14 16:29:40 +08:00
2youyouo2 c6c89fedac Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into physics 2017-03-10 10:59:40 +08:00
2youyouo2 d6ab74a55e support physics on android 2017-03-10 10:01:36 +08:00
2youyouo2 ca83d6038f fixed crash when create joint 2017-03-10 10:01:24 +08:00
zhangbin 7c9093cd9c Improve the js-binding implementation of slot.attachment. 2017-03-09 15:07:56 +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 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 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 f52fa57459 Fix event on heap not removing js proxy issue 2017-03-01 22:32:18 +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
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
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
James Chen 779cc28217 Sync from https://github.com/cocos2d/cocos2d-x/pull/17381 2017-02-20 10:46:28 +08:00
James Chen a9b35750cf Updates JSBindings to support pass a CA file through ‘new WebSocket(url, [protocols], caFilePath)’ API. 2017-02-16 11:15:45 +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
CocosRobot 482b5df3fc [ci skip][AUTO]: updating jsbinding automatically 2017-02-10 08:26:33 +00:00
pandamicro 9ae7ed8d38 Enhance pointer type conversion 2017-02-10 16:20:24 +08:00
zhangbin d5e3930131 Solve the conflict with google-protobuf. 2017-02-07 18:15:31 +08:00
pandamicro 1da6a0e5ae Revert Network modifications 2017-02-06 12:37:44 +08:00
pandamicro 1ada1f3351 Small fixes 2017-01-22 18:59:49 +08:00
pandamicro 13c57ba54a Add __ENABLE_GC_FOR_NATIVE_OBJECTS__ 2017-01-22 18:59:38 +08:00
pandamicro cec9760bd0 Fix websocket cycling destructor issue 2017-01-22 18:43:32 +08:00
pandamicro 353009ae79 Register cppOwner ptr to ensure viability in destructor of JS wrappers 2017-01-18 10:09:46 +08:00
pandamicro 87f2c31be5 Auto compartment when retain / release script object 2017-01-16 18:32:04 +08:00
Nan Wang 20d45b8e08 fixed FileUtils and downloader bindings in windows 2017-01-16 15:47:07 +08:00
CocosRobot 90e611f0d2 [AUTO][ci skip]: updating cocos2dx_files.json 2017-01-16 06:31:43 +00:00
pandamicro a4d8fd375b Improve xcode project settings 2017-01-16 14:23:22 +08:00
CocosRobot bbf4e25926 [ci skip][AUTO]: updating jsbinding automatically 2017-01-16 06:06:07 +00:00
pandamicro bc915ddc44 Add Downloader bindings 2017-01-16 13:57:10 +08:00
CocosRobot 598e507730 [ci skip][AUTO]: updating jsbinding automatically 2017-01-13 07:13:58 +00:00
pandamicro 0101edc8be Merge pull request #498 from pandamicro/v1.4
Fix compilation issues
2017-01-13 14:26:55 +08:00