Commit Graph

1343 Commits

Author SHA1 Message Date
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
Wang Nan da498313bd Merge pull request #575 from CocosRobot/update_cocosfiles_1489734522
[AUTO][ci skip]: updating cocos2dx_files.json
2017-03-17 15:28:42 +08:00
CocosRobot 5fcca0d630 [AUTO][ci skip]: updating cocos2dx_files.json 2017-03-17 07:08:42 +00:00
Wang Nan 2760e4ea6f Merge pull request #573 from 2youyou2/develop
update travis branch
2017-03-17 15:02:33 +08:00
2youyouo2 337eb6238a update bindings-generator 2017-03-17 14:44:22 +08:00
2youyouo2 f178b8e759 add fractions to raycast callback 2017-03-17 14:43:58 +08:00
2youyouo2 6fee15ae80 update travis branch 2017-03-17 14:20:44 +08:00
Wang Nan 8a0d360fb0 Merge pull request #571 from 2youyou2/develop
update external config.json
2017-03-16 14:52:07 +08:00
pandamicro 360ee4f0d5 Merge pull request #572 from zilongshanren/fix-bmfont-cache
fix bmfont cache
2017-03-16 10:19:08 +08:00
zilongshanren 4bff1b2c24 fix bmfont cache 2017-03-15 23:25:50 +08:00
2youyouo2 4060ac6990 update external config.json 2017-03-15 17:52:57 +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
Wang Nan 695e7a37fd Merge pull request #569 from 2youyou2/physics
fixed physics jsbinding
2017-03-15 14:41:54 +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
Wang Nan 161682d567 Merge pull request #567 from 2youyou2/physics
Physics
2017-03-14 17:39:38 +08:00
2youyouo2 2debabe1f0 update bindings-generator 2017-03-14 17:23:46 +08:00
2youyouo2 6e57af7aca fixed xocde and android project 2017-03-14 16:55:37 +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
Wang Nan 3510058e94 Merge pull request #558 from 2youyou2/physics
support physics binding
2017-03-14 09:57:36 +08:00
2youyouo2 e72dd14e76 Merge branch 'develop' into physics 2017-03-10 11:03:42 +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
Wang Nan 43fb745ffb Merge pull request #559 from natural-law/issue5282
Improve the js-binding implementation of slot.attachment.
2017-03-10 10:53:15 +08:00
Wang Nan 4bb3f54330 Merge pull request #560 from 2youyou2/develop
sync 1.4
2017-03-10 10:52:59 +08:00
2youyouo2 8f531c6dd9 Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into develop 2017-03-10 10:17:53 +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 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