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

26470 Commits

Author SHA1 Message Date
minggo d7fceb30bd Merge pull request #9757 from dualface/fix_framework_on_ios 
fix framework on iOS
 2014-12-31 18:04:15 +08:00
dualface 432bdf3541 fix framework on iOS 2014-12-31 18:01:03 +08:00
minggo cf6c08268f Merge pull request #9755 from dualface/fix_lua_debugger 
fix lua_debugger.c
 2014-12-31 17:51:00 +08:00
dualface b0199dfa61 fix lua_debugger.c 2014-12-31 17:46:48 +08:00
minggo bbfa7a9183 Merge pull request #9753 from samuele3hu/v3_4_httpclient 
Resolve the bug that requiring lua scrip did not consider the module dependent
 2014-12-31 16:48:33 +08:00
minggo 9af87ace7f Merge pull request #9754 from andyque/update-changelog 
update changelog
 2014-12-31 16:48:01 +08:00
minggo 3be5608696 Merge pull request #9751 from CocosRobot/update_lua_bindings_1420013583 
[AUTO]: updating luabinding automatically
 2014-12-31 16:47:51 +08:00
andyque 71c6f92903 update changelog 2014-12-31 16:45:09 +08:00
samuele3hu 54d376db01 Resolve the bug that requiring lua scrip did not consider the module dependent 2014-12-31 16:28:14 +08:00
CocosRobot 2e1d8b4e42 [AUTO]: updating luabinding automatically 2014-12-31 08:15:01 +00:00
minggo 0b0ca17031 Merge pull request #9748 from doomsdayer/v3_version1 
V3 version1
 2014-12-31 16:10:36 +08:00
yusheng.lu 718cfb9d37 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version1 2014-12-31 16:06:19 +08:00
yusheng.lu 89034469f5 Updated the version check description. 2014-12-31 16:01:11 +08:00
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