Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,639 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

26639 Commits

Author SHA1 Message Date
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
samuele3hu 0e94bdda3a Use android network module — HttpURLConnection to replace the libcurl on the android platform 2014-12-31 10:15:14 +08:00
minggo 51c89c3a22 Merge pull request #9720 from dabingnn/v3_perf 
V3 perf
 2014-12-31 10:02:59 +08:00
minggo 395d51c1f3 Merge pull request #9723 from CocosRobot/update_cocosfiles_1419991185 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-31 10:02:21 +08:00
huangshiwu 7426b5c4b5 iOS HttpClient replace libcurl 2014-12-31 10:02:14 +08:00
minggo 274d7d2276 Merge pull request #9718 from darkdukey/depthWriteFix 
Disable write to depth buffer for transparent objects
 2014-12-31 10:00:48 +08:00
CocosRobot a3e15a3d29 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 01:59:46 +00:00
minggo 0d23e5906d Merge pull request #9717 from geron-cn/armaturenodefix 
make current animation name take effect when autoplay is false
 2014-12-31 09:58:35 +08:00
minggo 5d109d0415 Merge pull request #9721 from MSOpenTech/wp8-fix 
WP8 and Windows 8.1 Universal App fixes
 2014-12-31 09:47:58 +08:00
minggo a281634c1e Merge pull request #9711 from dabingnn/v3_addUpdateUniformsAndAttributes 
V3 add update uniforms and attributes
 2014-12-31 09:45:08 +08:00
Dale Stammen f73a07c7b9 added missing files 2014-12-30 17:27:37 -08:00
Dale Stammen bd1fef7515 added missing files 2014-12-30 16:40:04 -08:00
Dale Stammen 57f0ef41b4 added missing inet_pton() for windows phone 2014-12-30 16:39:26 -08:00
Dale Stammen d33fad0ac7 fixed check for header already included 2014-12-30 16:39:02 -08:00
Dale Stammen f4cd2e311d added missing inet_pton() for windows phone 2014-12-30 16:38:18 -08:00
Nite Luo a68dfa13ec Disable Depth Write for transparent objects 2014-12-30 13:35:29 -08:00
geron-cn 89c39d3f10 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix 2014-12-31 04:06:11 +08:00
geron-cn b048b65ae3 make current animation name take effect when autoplay is false 2014-12-31 03:59:36 +08:00
minggo bc77d87a8e Merge pull request #9712 from CocosRobot/update_cocosfiles_1419935693 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-30 18:36:32 +08:00
CocosRobot cb7a63b413 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-30 10:34:54 +00:00