minggo
|
292fff3c29
|
Merge pull request #9746 from pandamicro/v3_origin
Current restart game will disable ActionManager
|
2014-12-31 15:50:33 +08:00 |
pandamicro
|
677f7ca1d3
|
Improve restart game
|
2014-12-31 15:32:59 +08:00 |
minggo
|
2495d698c0
|
Merge pull request #9745 from huangshiwu/iosnetwork_template
iOS runtime template add security.framework
|
2014-12-31 15:20:20 +08:00 |
minggo
|
50914665e6
|
Merge pull request #9742 from huangshiwu/iosnetwork_template
ios template add security.framework
|
2014-12-31 15:15:08 +08:00 |
huangshiwu
|
7702c102a2
|
iOS runtime template add security.framework
|
2014-12-31 15:15:01 +08:00 |
minggo
|
010f48f28a
|
Merge pull request #9744 from CocosRobot/update_cocosfiles_1420010066
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 15:14:45 +08:00 |
CocosRobot
|
85ccfb2209
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 07:14:27 +00:00 |
minggo
|
3c83bd2fb3
|
Merge pull request #9733 from andyque/update-curl
Update curl
|
2014-12-31 15:13:18 +08:00 |
minggo
|
956b5567a2
|
Merge pull request #9743 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-12-31 15:05:55 +08:00 |
zhangbin
|
6adedee781
|
Update the reference of submodule cocos2d-console.
|
2014-12-31 14:55:14 +08:00 |
huangshiwu
|
ac2ff38624
|
ios template add security.framework
|
2014-12-31 14:46:34 +08:00 |
minggo
|
59247581e1
|
Merge pull request #9741 from CocosRobot/update_lua_bindings_1420006889
[AUTO]: updating luabinding automatically
|
2014-12-31 14:39:40 +08:00 |
CocosRobot
|
3614f716ae
|
[AUTO]: updating luabinding automatically
|
2014-12-31 06:23:33 +00:00 |
andyque
|
5d9274acf5
|
fix conflicts
|
2014-12-31 14:22:18 +08:00 |
minggo
|
94e1eb6406
|
Merge pull request #9740 from cocos2d/revert-9693-v3_version
Revert "Feature of version check. "
|
2014-12-31 14:18:58 +08:00 |
minggo
|
ad443da6a0
|
Revert "Feature of version check. "
|
2014-12-31 14:17:18 +08:00 |
andyque
|
62b1404213
|
Merge branch 'v3' into update-curl
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-12-31 14:04:04 +08:00 |
minggo
|
4db4fb47f6
|
Merge pull request #9739 from CocosRobot/update_cocosfiles_1420005049
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 13:56:08 +08:00 |
andyque
|
417c2efaba
|
revert linux cmake modification
|
2014-12-31 13:54:35 +08:00 |
CocosRobot
|
ced43a1c2b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 05:50:50 +00:00 |
minggo
|
84c193a343
|
Merge pull request #9737 from samuele3hu/v3_4_httpclient
Resolve the require file errror
|
2014-12-31 13:49:16 +08:00 |
minggo
|
e24e5b7fc4
|
Merge pull request #9736 from MSOpenTech/wp8-fix2
WP8 and Windows 8.1 Universal App fixes
|
2014-12-31 13:48:21 +08:00 |
samuele3hu
|
6bad549285
|
Resolve the require file errror
|
2014-12-31 13:43:47 +08:00 |
Dale Stammen
|
d8c2927944
|
added base/allocator files
|
2014-12-30 21:41:46 -08:00 |
Dale Stammen
|
7276f64f29
|
updated dll name from 3.3 to 3.4
|
2014-12-30 21:40:01 -08:00 |
minggo
|
1c66f2c90d
|
Merge pull request #9735 from CocosRobot/update_cocosfiles_1420002076
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 13:34:50 +08:00 |
Dale Stammen
|
79e71b6c50
|
Merge branch 'v3' into wp8-fix2
|
2014-12-30 21:25:54 -08:00 |
Dale Stammen
|
5c79bf996d
|
delete first pass of allocations before starting second pass
|
2014-12-30 21:24:49 -08:00 |
Dale Stammen
|
2948a0cdcd
|
used CreateMutexEx for WINRT and WP8
|
2014-12-30 21:24:05 -08:00 |
Dale Stammen
|
ac95d292bd
|
added base/allocator files
|
2014-12-30 21:21:36 -08:00 |
Dale Stammen
|
4e4028fc67
|
added missing files
|
2014-12-30 21:03:57 -08:00 |
Dale Stammen
|
09efe9be04
|
removed unused winrt CCPlatformDefine.h
|
2014-12-30 21:03:33 -08:00 |
CocosRobot
|
d4c9205320
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 05:01:17 +00:00 |
minggo
|
161b0a3985
|
Merge pull request #9727 from samuele3hu/v3_4_httpclient
Use android network module — HttpURLConnection to replace the libcurl on the android platform
|
2014-12-31 13:00:04 +08:00 |
minggo
|
3b1d75bff0
|
Merge pull request #9734 from CocosRobot/update_cocosfiles_1420001485
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 12:54:00 +08:00 |
Dale Stammen
|
df64718ef1
|
removed 3dExport.h as it no longer exists
|
2014-12-30 20:51:54 -08:00 |
CocosRobot
|
1f8bb3f808
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 04:51:26 +00:00 |
minggo
|
fde63be06a
|
Merge pull request #9725 from huangshiwu/iosnetwork
iOS HttpClient replace libcurl
|
2014-12-31 12:50:11 +08:00 |
minggo
|
ee5b24e001
|
Merge pull request #9732 from super626/v3
Read version 0.6
|
2014-12-31 12:47:38 +08:00 |
samuele3hu
|
3795f9cc2a
|
Rename HttpClient-android.cpp and unify java indent format
|
2014-12-31 12:03:27 +08:00 |
andyque
|
ddb6e678a6
|
update config.json
|
2014-12-31 11:58:54 +08:00 |
yangxiao
|
d23eb83ba1
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-12-31 11:40:37 +08:00 |
huangshiwu
|
893aded9b7
|
iOS HttpClient replace libcurl - fix Jenkins compile error
|
2014-12-31 11:32:35 +08:00 |
Huabing.Xu
|
4e70f44989
|
Merge pull request #9726 from dabingnn/v3_updateChangelog
[ci skip] update changeLog
|
2014-12-31 10:35:44 +08:00 |
Huabing.Xu
|
a9cc40cc6a
|
[ci skip] update changeLog
|
2014-12-31 10:34:42 +08:00 |
andyque
|
489219ff5e
|
add prebuilt libcurl to linux
|
2014-12-31 10:19:03 +08:00 |
andyque
|
7a8634ff0e
|
remove libcurl.dylib
|
2014-12-31 10:18:44 +08:00 |
andyque
|
5caccfd053
|
upgrade libcurl mac project settings
|
2014-12-31 10:18:44 +08:00 |
andyque
|
60ec08eef4
|
upgrade libcurl for iOS
|
2014-12-31 10:18:44 +08:00 |
samuele3hu
|
f7ed73c1e1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient
|
2014-12-31 10:17:12 +08:00 |