Commit Graph

4804 Commits

Author SHA1 Message Date
CocosRobot bc0d81d8b9 [ci skip][AUTO]: updating jsbinding automatically 2017-04-24 04:18:54 +00:00
pandamicro eb55b59f14 Fix crash caused by some action create functions not referencing sub action 2017-04-24 12:05:36 +08:00
James Chen 1f256946f8 Updates win32 project configuration. 2017-04-24 11:57:08 +08:00
James Chen fc98b4bdc0 Sync with cocos2d-x v3 branch ddb4dc8 commit. 2017-04-24 10:49:02 +08:00
CocosRobot 341e3e0741 [ci skip][AUTO]: updating jsbinding automatically 2017-04-22 19:23:17 +00:00
pandamicro 7df074e172 Reverse pure JS Action, reuse JSB Action 2017-04-22 14:57:16 +08:00
zilongshanren 60587b4e9d fix ios label shrink bug 2017-04-21 13:53:39 +08:00
2youyouo2 c1643c4dec update submodule 2017-04-21 09:47:32 +08:00
2youyouo2 ad1a01cff1 update gen-libs command to use android-studio 2017-04-21 09:42:29 +08:00
2youyouo2 678e5ba92e fixed binary android-studio project 2017-04-21 09:41:47 +08:00
2youyouo2 f1bffe9e4b fixed android compile error with newest ndk-tool in binary template 2017-04-21 09:41:00 +08:00
2youyouo2 4ebcc72f19 update android-studio project 2017-04-21 09:37:40 +08:00
2youyouo2 5397eebcd5 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into android-studio 2017-04-20 11:14:20 +08:00
Justin Godesky 4b62fd088a Update README.md
Fixed the "Removed 3d features" bullet point nesting
2017-04-19 14:57:45 -04:00
2youyouo2 1f7545af2b android-studio 2017-04-19 18:21:29 +08:00
Wang Nan a5de958216 Merge pull request #591 from 2youyou2/physics
improve physics
2017-04-19 09:54:19 +08:00
2youyouo2 56b0891bd8 improve physics 2017-04-18 17:35:37 +08:00
Nan Wang db23cf286e update version to 1.5.0 2017-04-14 09:55:10 +08:00
CocosRobot c30d131df3 [AUTO][ci skip]: updating cocos2dx_files.json 2017-04-12 08:29:32 +00:00
Wang Nan 42ca41c5f0 Merge pull request #589 from cocos-creator/v1.4
merge V1.4
2017-04-12 16:23:16 +08:00
pandamicro 7b982b5c51 Use incremental gc by default 2017-04-12 14:34:22 +08:00
pandamicro 5970b7839b Support xhr.send(null) 2017-04-12 14:33:57 +08:00
2youyouo2 25a0b03c79 update bindings-generator 2017-04-01 17:40:40 +08:00
2youyouo2 58ff7ea4b9 Merge branch 'physics' of github.com:2youyouo2/cocos2d-x-lite into physics 2017-04-01 17:34:01 +08:00
2youyouo2 c2dac69880 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into physics
# Conflicts:
#	cocos/scripting/js-bindings/auto/api/jsb_creator_auto_api.js
2017-04-01 17:33:32 +08:00
2youyou2 bc1e86300d update windows physics project 2017-04-01 17:26:06 +08:00
2youyouo2 cff21d0aa1 revert changes 2017-04-01 16:32:29 +08:00
2youyouo2 c245c08624 add b2AABB_to_jsval 2017-04-01 15:28:07 +08:00
2youyouo2 8cb30741bf optimize contact listener 2017-04-01 15:27:34 +08:00
2youyouo2 2612e32ef1 optimize physics with cache object 2017-03-30 16:06:09 +08:00
CocosRobot 9bc01df69f [ci skip][AUTO]: updating jsbinding automatically 2017-03-29 10:25:30 +00:00
Wang Nan 6c66535cb1 Merge pull request #580 from 2youyou2/camera
Camera
2017-03-29 18:20:33 +08:00
2youyouo2 b21093162a Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into physics2 2017-03-29 17:59:18 +08:00
Wang Nan 13202cd67d Merge pull request #583 from CocosRobot/update_js_bindings_1490778249
[ci skip][AUTO]: updating jsbinding automatically
2017-03-29 17:13:27 +08:00
Nan Wang 58ddc819a9 merge v1.4 2017-03-29 17:12:33 +08:00
Nan Wang 2f7cafa723 update bindings-generator for std_vector float support 2017-03-29 17:07:29 +08:00
CocosRobot c7e2e6a607 [ci skip][AUTO]: updating jsbinding automatically 2017-03-29 09:06:15 +00:00
Wang Nan 775d254e4b Merge pull request #579 from pandamicro/develop
Remove native ActionManager
2017-03-29 17:01:10 +08:00
2youyouo2 4a10f29666 fixed physics memory leak 2017-03-29 16:57:25 +08:00
David DeSimone 7f2a7c85fa Adding missing spine property access in jsb 2017-03-28 23:10:21 -07:00
2youyouo2 e6996e9eaf Merge branch 'camera' of github.com:2youyouo2/cocos2d-x-lite into camera 2017-03-27 10:38:48 +08:00
2youyouo2 3d513e3aa4 refine camera 2017-03-27 10:38:30 +08:00
2youyou2 4944a9acdd add CameraNode to vs project 2017-03-24 15:37:14 +08:00
2youyouo2 04910aa3c4 add CameraNode 2017-03-24 11:55:32 +08:00
pandamicro 63ea21166c Remove some useless bindings 2017-03-23 18:20:34 +08:00
pandamicro 2fcd3cd67e Remove native actionManager from jsb 2017-03-23 18:17:02 +08:00
pandamicro 201a2ba4e4 Compilation succeed after remove Action in native 2017-03-23 18:15:47 +08:00
Jare Guo a9713955c7 define rotation property for dragonbone 2017-03-22 15:37:31 +08:00
zhangbin a04b84dfdc Update submodule reference of cocos2d-console.
Changed: Solve the error when build Android Studio project with Android SDK Tools 25.3.x on Windows.
2017-03-22 14:01:59 +08:00
Wang Nan 631eda1e46 Merge pull request #574 from 2youyou2/physics
Physics
2017-03-17 15:28:54 +08:00