Commit Graph

362 Commits

Author SHA1 Message Date
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
Wenhai Lin 033cd4649f IPV6 compatibility 2016-05-19 01:46:01 +08:00
Wenhai Lin c3a3a40af7 refine 2016-05-18 22:56:39 +08:00
Wenhai Lin 18c705f5c0 Merge pull request #128 from WenhaiLin/master
Fixed compile fail on Mac
2016-05-18 22:36:02 +08:00
Wenhai Lin 5935df42be Fixed compile fail on Mac 2016-05-18 22:32:40 +08:00
Nan Wang 9206b8bda1 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-18 19:39:07 +08:00
Nan Wang 57139c79d1 ignore simulator.json 2016-05-18 19:38:23 +08:00
Wenhai Lin e7499a3e9a Merge pull request #127 from WenhaiLin/master
Refine FileUtilsAndroid::getData
2016-05-18 19:21:38 +08:00
Wenhai Lin bf7ad0dabd Refine FileUtilsAndroid::getData 2016-05-18 19:20:03 +08:00
zilongshanren 83aabfbed2 Update cocos2d.cpp 2016-05-18 18:32:51 +08:00
pandamicro 88cfbbe17e Merge pull request #123 from 2youyouo2/develop
fixed templates
2016-05-18 18:17:03 +08:00
pandamicro 5494977615 Merge pull request #124 from 2youyouo2/android
Android
2016-05-18 17:48:58 +08:00
pandamicro 49a46a1043 Merge pull request #126 from 2youyouo2/win32
update win32 project
2016-05-18 17:48:26 +08:00
2youyou2 02b9841b08 update win32 project 2016-05-18 17:44:49 +08:00
Wenhai Lin 1083647744 Merge pull request #125 from WenhaiLin/master
Disable `cc.log` in release mode.(Redefine it in CocosRuntime)
2016-05-18 17:44:35 +08:00
Wenhai Lin e571338580 Disable cc.log in release mode.(Redefine it in CocosRuntime) 2016-05-18 17:43:47 +08:00
CocosRobot 17102e25ea [ci skip][AUTO]: updating jsbinding automatically 2016-05-18 15:22:13 +08:00
pandamicro cac05f6128 Add AssetsManagerEx to extension 2016-05-18 15:21:56 +08:00
2youyou2 a2b623cd32 fixed templates 2016-05-18 15:04:19 +08:00
Wenhai Lin 87a9528c19 Merge pull request #122 from WenhaiLin/master
Use const references whenever possible
2016-05-18 14:57:30 +08:00
Wenhai Lin 7c57507422 Use const references whenever possible 2016-05-18 14:55:47 +08:00
zilongshanren b6b21ae891 Merge pull request #121 from CocosRobot/update_js_bindings_1463553096
[ci skip][AUTO]: updating jsbinding automatically
2016-05-18 14:38:52 +08:00
CocosRobot 00ba43da72 [ci skip][AUTO]: updating jsbinding automatically 2016-05-18 06:36:03 +00:00
zilongshanren 7a9ee88619 Merge pull request #120 from CocosRobot/update_cocosfiles_1463552945
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-18 14:32:41 +08:00
Wenhai Lin 99a93d8599 Merge pull request #119 from WenhaiLin/master
Use const references whenever possible
2016-05-18 14:29:47 +08:00
CocosRobot d58018311e [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-18 06:29:05 +00:00
pandamicro 96b61bfb45 Merge pull request #118 from pandamicro/develop
Add AssetsManagerEx to extension
2016-05-18 14:28:15 +08:00
Wenhai Lin 5dcd5ed979 Use const references whenever possible 2016-05-18 14:26:43 +08:00
pandamicro 87ca37f50f Add AssetsManagerEx to extension 2016-05-18 14:19:55 +08:00
Wenhai Lin 94c6dcdf6a Replace CCAssert macros with CCASSERT 2016-05-18 13:50:49 +08:00
pandamicro eaf4396a67 Merge pull request #117 from pandamicro/develop
fix WebSocket  bug for JSB
2016-05-18 11:03:27 +08:00
knoxHuang 2c45914b84 fix WebSocket bug for JSB 2016-05-18 11:02:37 +08:00
2youyouo2 dfbe1d2a2c Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into android 2016-05-18 10:37:25 +08:00