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

506 Commits

Author SHA1 Message Date
CocosRobot 93800c5821 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-13 01:27:24 +00:00
CocosRobot f8f15df530 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-11 07:06:46 +00:00
minggo 43a3603a8b Merge pull request #7720 from samuele3hu/v3_module 
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
 2014-08-11 15:01:28 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
CocosRobot 076a2f9d1a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-11 01:32:55 +00:00
samuele3hu 2dacbf6f26 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-08 16:59:33 +08:00
samuele3hu 2ffc0e2e53 Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 16:56:22 +08:00
samuele3hu 4fe1b2e6bc Fix the target dependencies error of lua-runtime-template 2014-08-08 16:10:31 +08:00
CocosRobot 1b4cd7e58e [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-08 07:58:25 +00:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
samuele3hu 00865c8abb Modify the mechanism that files copy to lua-empty-test and lua-template 2014-08-08 15:22:12 +08:00
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
CocosRobot 75bd97b82e [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-08 03:51:09 +00:00
minggo b9e84370f6 Merge pull request #7699 from huangshiwu/v3_wp8fix 
V3 wp8fix
 2014-08-08 11:49:02 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
 2014-08-07 14:02:50 +08:00
samuele3hu 0421c24d16 Modify lua-template-default and lua-template-runtime project 2014-08-07 13:54:54 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00
huangshiwu 0016c7af70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
CocosRobot 92bb832d18 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-07 02:54:38 +00:00
CocosRobot 075c890ef1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-06 09:51:57 +00:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module 
Split luabindings into serval modules and adjust project settings of test cases
 2014-08-06 17:09:12 +08:00
CocosRobot 35a19dd0ea [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-06 07:24:27 +00:00
minggo fdcf6a0c7c Merge pull request #7672 from xiangxw/show_lua_error_message 
show error after a win32 lua program crashes
 2014-08-06 14:39:25 +08:00
minggo 08cc7982d7 Merge pull request #7666 from zawasp/template_fix 
Template fix
 2014-08-06 10:03:12 +08:00
samuele3hu 63b3f838b6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-06 09:56:07 +08:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
xiangxw 78587254a5 show error after a win32 lua program crashes 2014-08-05 21:10:30 +08:00
CocosRobot eacb8fa120 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 10:23:15 +00:00
CocosRobot 3a3cf0383d [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 08:38:41 +00:00
Mircea Rila 119ca86e3f additional fixes for win32 project 2014-08-05 11:29:04 +03:00
Mircea Rila d808581d2b fix win32 template project 2014-08-05 10:43:29 +03:00
Mircea Rila 5720df4336 add VS 2013 support for C++ template 2014-08-05 10:11:04 +03:00
samuele3hu da18657f4f Add module Android.mk config and adjust related test cases 2014-08-05 13:29:54 +08:00
CocosRobot 1772ab78ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 02:13:45 +00:00
CocosRobot 0f3fbfa07f [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 02:00:57 +00:00
samuele3hu cd0c82f8b7 Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates 2014-08-04 17:11:57 +08:00
yangxiao d6d3ea6b18 fix template 2014-08-04 13:12:59 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
samuele3hu c5c394846c Adjust iOS and Mac tempts for Lua 2014-08-04 10:25:17 +08:00
CocosRobot ea1d9d4657 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 07:58:06 +00:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
CocosRobot ce8c5ee327 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 03:58:50 +00:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
CocosRobot 6dd02ade69 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 07:51:17 +00:00
CocosRobot 06d43ed2fd [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-30 01:28:27 +00:00
CocosRobot a743590ac5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 08:09:10 +00:00
CocosRobot 3d7cced94e [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 06:30:39 +00:00
shinriyo 3da15a7f92 typo function 
however it is not the dog.
squirrel....
 2014-07-29 00:37:55 +09:00