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 |
|
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 |
|
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 |
|