Commit Graph

394 Commits

Author SHA1 Message Date
Nan Wang aeddb5cc69 Merge branch 'v1.1' of github.com:cocos-creator/cocos2d-x-lite into v1.1 2016-06-01 17:34:08 +08:00
Wang Nan 76e880685a Merge pull request #155 from nantas/develop
fix gen-libs cmd line
2016-06-01 17:33:57 +08:00
Nan Wang 819db85575 Merge branch 'develop' of github.com:nantas/cocos2d-x-lite into v1.1 2016-06-01 17:32:16 +08:00
Jare Guo b610a9d1b4 Merge pull request #153 from natural-law/issue3149
Support CSV format tmx file in TiledMap.
2016-05-31 17:09:30 +08:00
zhangbin 9fd7d51932 Support CSV format tmx file in TiledMap. 2016-05-31 14:50:35 +08:00
pandamicro 27be086d03 Merge pull request #151 from CocosRobot/update_js_bindings_1464328958
[ci skip][AUTO]: updating jsbinding automatically
2016-05-27 14:09:44 +08:00
CocosRobot dc3d4ce03b [ci skip][AUTO]: updating jsbinding automatically 2016-05-27 06:06:47 +00:00
pandamicro a21cbcdc72 Merge pull request #150 from pandamicro/develop
Fix bindings issues with AssetsManager
2016-05-27 13:59:43 +08:00
Wang Nan 68fdcbde33 Merge pull request #149 from CocosRobot/update_js_bindings_1464317985
[ci skip][AUTO]: updating jsbinding automatically
2016-05-27 12:08:35 +08:00
pandamicro c7a975f8d1 Fix bindings issues with AssetsManager 2016-05-27 11:11:54 +08:00
CocosRobot e7ca10567b [ci skip][AUTO]: updating jsbinding automatically 2016-05-27 03:04:27 +00:00
Wang Nan 57bf6380a2 Merge pull request #148 from dabingnn/develop_add_distortion
Develop add distortion
2016-05-27 10:56:33 +08:00
Huabing.Xu 57037c1cbe uniform works 2016-05-27 10:49:07 +08:00
Huabing.Xu 1f0262622f add uniform settings 2016-05-27 10:43:08 +08:00
Huabing.Xu 2ce14b8b10 add distortion shader 2016-05-26 16:53:57 +08:00
Wang Nan 38f68557e8 Merge pull request #146 from natural-law/develop
Update the reference of submodule cocos2d-console.
2016-05-26 10:57:08 +08:00
zhangbin 590f4576d1 Update the reference of submodule cocos2d-console.
1. Change the Tracker ID of GA in console.
2. Disable the BI Data Statistic.
2016-05-26 10:46:20 +08:00
Nan Wang b3eae82599 merge master 2016-05-25 18:35:02 +08:00
Wang Nan e63d0e0650 Merge pull request #144 from dumganhar/typo-fix
typo fix: destoryAudioEngine -> destroyAudioEngine
2016-05-25 17:34:29 +08:00
James Chen ca2ae05042 typo fix: destoryAudioEngine -> destroyAudioEngine 2016-05-25 17:22:18 +08:00
Wang Nan 590c596cb0 Merge pull request #142 from 2youyouo2/develop
pointer COCOS_X_ROOT to cocos-x directory
2016-05-25 09:33:45 +08:00
Wang Nan f516acf674 Merge pull request #143 from natural-law/develop
Update the reference of submodule cocos2d-console.
2016-05-25 09:33:19 +08:00
zhangbin 343c14f86c Update the reference of submodule cocos2d-console.
1. Support absolute path in config `ndk-module-paths`.
2. Support absolute path & environment variable in copy files config.
2016-05-24 18:32:18 +08:00
2youyou2 f0d947d66f update android template sdk level 2016-05-24 18:29:05 +08:00
zilongshanren 5cafbc67a2 Merge pull request #141 from zilongshanren/fix-videoplayer-jsb
revert cc.VideoPlayer polyfill
2016-05-24 18:20:00 +08:00
zilongshanren db1962a19d revert cc.VideoPlayer polyfill 2016-05-24 18:10:12 +08:00
2youyou2 6c38a81b22 pointer COCOS_X_ROOT to cocos-x directory 2016-05-24 16:58:05 +08:00
Nan Wang 8b3b94b5fc fix gen-libs cmd line 2016-05-23 18:33:30 +08:00
zilongshanren 60d3f40df5 Merge pull request #140 from CocosRobot/update_cocosfiles_1463997210
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-23 17:55:14 +08:00
CocosRobot bb25c6a1e4 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-23 09:53:30 +00:00
zilongshanren 17afd58656 Merge pull request #139 from zilongshanren/addVideoPlayer
fix gen cocos files script
2016-05-23 17:50:32 +08:00
zilongshanren c3fb81d456 fix gen cocos files script 2016-05-23 17:49:38 +08:00
zilongshanren fff808d036 Merge pull request #138 from zilongshanren/addVideoPlayer
adapt video player jsb
2016-05-23 16:04:02 +08:00
zilongshanren 91f852beef adapt video player jsb 2016-05-23 16:02:52 +08:00
Wang Nan 523e60cfcb Merge pull request #137 from cocos-creator/master
merge Master
2016-05-23 15:44:39 +08:00
Wang Nan 04de9f4863 Merge pull request #136 from natural-law/develop
Solve the issue :  Can't build android portrait project from binary template in Creator.
2016-05-23 15:43:39 +08:00
zhangbin a4a2e86973 Solve the issue : can't build android portrait project from binary template in Creator. 2016-05-23 11:56:32 +08:00
Wenhai Lin 4bfcf8951f Merge pull request #135 from WenhaiLin/master
Fixed crash
2016-05-20 11:53:35 +08:00
Wenhai Lin 14d3fc1fdb Fixed crash 2016-05-20 11:52:13 +08:00
Wang Nan d0d8f058fd Merge pull request #133 from nantas/develop
update readme with build instruction
2016-05-19 10:36:20 +08:00
Nan Wang 2fa0e78abd update readme with build instruction 2016-05-19 10:34:52 +08:00
Nan Wang f8ae713d36 combine update simulator script to update simulator config 2016-05-19 10:30:53 +08:00
Wang Nan 26306350bf Merge pull request #129 from cocos-creator/master
merge master
2016-05-19 09:56:18 +08:00
Nan Wang 4fa6b8ec78 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-19 09:55:34 +08:00
Wenhai Lin b946197b7e Merge pull request #131 from pandamicro/master
Add back AssetsManagerEx
2016-05-19 09:54:45 +08:00
Wenhai Lin cb6b5f3c8e Merge pull request #132 from WenhaiLin/master
IPV6 compatibility
2016-05-19 09:48:55 +08:00
Nan Wang ae6b17ad72 merge master 2016-05-19 09:48:23 +08:00
pandamicro 4e24978a26 Merge pull request #130 from pandamicro/develop
Fix unzip header url
2016-05-19 09:47:01 +08:00
pandamicro ea07f2dd89 Fix unzip header url 2016-05-19 09:45:53 +08:00
pandamicro 769d7141c9 Fix unzip header url 2016-05-19 09:45:29 +08:00