Commit Graph

201 Commits

Author SHA1 Message Date
James Chen 259bbbd6b2 updates. 2017-06-16 16:32:24 +08:00
James Chen e5bae9edfe updates generator 2017-06-15 17:25:21 +08:00
James Chen 91359f1f75 first commit 2017-06-15 17:24:30 +08:00
zilongshanren 3f1b33258c improve system label wrap option 2017-05-22 17:14:28 +08:00
2youyouo2 61c76e0d8b support vs 2017 2017-05-17 18:02:57 +08:00
pandamicro 67c46cc22b Improve function wrapper 2017-05-16 15:07:21 +08:00
Wang Nan 8e7c661291 Merge pull request #628 from 2youyou2/physics
add rigidbody.getJointList
2017-05-15 18:00:15 +08:00
2youyouo2 c8918d17dd add rigidbody.getJointList 2017-05-15 17:16:13 +08:00
2youyou2 2c0465b8e1 update submodule 2017-05-11 11:04:49 +08:00
2youyou2 30af1a3736 update submodule 2017-05-10 13:57:00 +08:00
2youyou2 8a60346382 fixed bzero error 2017-05-10 13:56:23 +08:00
knoxHuang 9319dd7002 fix DeviceMotion bug for fireball/issues/5679 2017-05-08 15:32:40 +08:00
pandamicro bbec08eebb Merge pull request #612 from pandamicro/am
Enhance functionalities of AssetsManager
2017-05-04 23:32:52 +08:00
pandamicro e37196f41d Fix issues with AssetsManager new features 2017-05-04 23:32:08 +08:00
2youyouo2 166923e174 update submodule 2017-05-04 11:01:58 +08:00
2youyouo2 d7b3bc096b fixed windows commands char length too long 2017-04-27 17:31:32 +08:00
Wang Nan 875e646809 Merge pull request #604 from 2youyou2/android-studio
add simulator android-studio project
2017-04-25 15:47:03 +08:00
2youyouo2 bc068518ef add simulator android-studio project 2017-04-25 15:09:02 +08:00
Nan Wang 97ccfb6f4c update console repo, update external tag to 27 2017-04-25 10:13:06 +08:00
pandamicro eb55b59f14 Fix crash caused by some action create functions not referencing sub action 2017-04-24 12:05:36 +08:00
pandamicro 7df074e172 Reverse pure JS Action, reuse JSB Action 2017-04-22 14:57:16 +08:00
2youyouo2 c1643c4dec update submodule 2017-04-21 09:47:32 +08:00
2youyouo2 25a0b03c79 update bindings-generator 2017-04-01 17:40:40 +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
2youyouo2 cff21d0aa1 revert changes 2017-04-01 16:32:29 +08:00
2youyouo2 2612e32ef1 optimize physics with cache object 2017-03-30 16:06:09 +08:00
Wang Nan 6c66535cb1 Merge pull request #580 from 2youyou2/camera
Camera
2017-03-29 18:20:33 +08:00
Nan Wang 2f7cafa723 update bindings-generator for std_vector float support 2017-03-29 17:07:29 +08:00
2youyouo2 4a10f29666 fixed physics memory leak 2017-03-29 16:57:25 +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
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
2youyouo2 337eb6238a update bindings-generator 2017-03-17 14:44:22 +08:00
Wang Nan bb560bbdc5 Merge pull request #568 from natural-law/update-cocos
Update the reference of submodule cocos2d-console.
2017-03-15 14:42:19 +08:00
2youyouo2 594075ec69 fixed physics jsbinding 2017-03-15 11:09:59 +08:00
zhangbin 89eaab956a Update the reference of submodule cocos2d-console.
Changed:
1. Support VS2017 in cocos compile. (Related issue: cocos-creator/fireball#5404 )
2. Solve the error that when building android project with Android SDK Tools 25.3.x.  (Related issue: cocos-creator/fireball#5406 )
2017-03-15 10:07:33 +08:00
2youyouo2 2debabe1f0 update bindings-generator 2017-03-14 17:23:46 +08:00
2youyou2 fc7de34ab0 fixed windows physics compile error 2017-03-14 16:29:40 +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
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
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
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
pandamicro 9ae7ed8d38 Enhance pointer type conversion 2017-02-10 16:20:24 +08:00
pandamicro 714c6b2338 Add network config to genbindings 2017-01-16 14:12:50 +08:00
pandamicro bc915ddc44 Add Downloader bindings 2017-01-16 13:57:10 +08:00
pandamicro 40d600f1e2 Fix compilation issue when lambda function has return value 2017-01-13 15:06:39 +08:00