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

567 Commits

Author SHA1 Message Date
CocosRobot 071aedaa51 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 02:56:25 +00:00
samuele3hu d681bdce92 Fix the crash of project which was created by the lua-template-runtime 2014-09-03 14:54:58 +08:00
CocosRobot 1ec9933045 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 05:37:45 +00:00
minggo 66943eec98 Merge pull request #7932 from minggo/remove-unneeded-files 
remove unneeded files
 2014-09-03 13:36:31 +08:00
CocosRobot 61a3c80cb9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 04:05:23 +00:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
CocosRobot 2dea7c3a18 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 03:26:30 +00:00
CocosRobot d0ac64b2e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-29 05:43:47 +00:00
zhangbin e24a903c88 Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1. 2014-08-28 16:13:11 +08:00
CocosRobot 27b8fd02ad [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-28 02:18:38 +00:00
CocosRobot f1914f3fa1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-27 05:40:25 +00:00
samuele3hu 471820568f Update android.mk of cocos and lua-templates 2014-08-27 10:28:04 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
CocosRobot 8d88109db7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 06:57:10 +00:00
minggo 37aeb5b114 Merge pull request #7872 from samuele3hu/v3_3_new_module 
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
 2014-08-25 14:55:46 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
CocosRobot b165137f40 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 03:19:31 +00:00
minggo ba4825a5fa Merge pull request #7869 from huangshiwu/v3_glviewattrs 
OpenGL context attributions setting revise -modify lua template
 2014-08-25 11:18:15 +08:00
minggo e5ac6e204b Merge pull request #7864 from minggo/module-devide 
Module devide
 2014-08-25 11:01:19 +08:00
huangshiwu 9eda72f54a OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
CocosRobot b55c174bba [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:56:17 +00:00
CocosRobot 91eba38eda [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:40:55 +00:00
huangshiwu 07af58c0c2 OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
samuele3hu a3e4402c5f Adjust cpp-template-default template 2014-08-22 13:50:28 +08:00
teivaz 312f57d7a6 - [WP8] Now replacing application display name with project name 2014-08-21 18:49:52 +03:00
CocosRobot 9c2cbaf742 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-20 05:37:22 +00:00
andyque 9a3c2dc6a4 Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-20 09:56:16 +08:00
teivaz ebb0876d29 * [WP8] Fixed resource search path in template 2014-08-19 21:44:46 +03:00
teivaz 5cdbf4c04c * [WP8] Fixed paths in template 2014-08-19 19:57:06 +03:00
CocosRobot 218cee5e05 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:55:40 +00:00
CocosRobot 94b45d55ef [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:43:41 +00:00
samuele3hu f36e7c6617 Add register_cocos3d_module for lua template 2014-08-18 19:46:11 +08:00
samuele3hu 22a48fb760 Update cpp and lua template to support cocos3d lib 2014-08-18 19:23:03 +08:00
CocosRobot 128d06076a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-15 07:41:13 +00:00
minggo f2f8035724 Merge pull request #7708 from super626/obb 
AABB, OBB
 2014-08-15 15:32:14 +08:00
minggo 965f4f8ef4 Merge pull request #7791 from xiangxw/fix_replaceAll 
fix replaceAll()
 2014-08-15 15:03:06 +08:00
xiangxw 8b83419a32 fix replaceAll() 
This function will never return if new_value contains old_value.
For example, old_value = "'", new_value = "''".
 2014-08-15 11:48:33 +08:00
samuele3hu 76a9382a91 Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8 2014-08-15 00:08:15 +08:00
samuele3hu 55180c63e4 Add modules register functions for lua-template-runtime on android 2014-08-14 23:22:24 +08:00
samuele3hu 97d8d27eec Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android 2014-08-14 21:58:40 +08:00
samuele3hu 1976b66ab8 Make lua-template-default support all modules 2014-08-14 21:27:02 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
CocosRobot 2d4f23d9e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-14 10:36:05 +00:00
minggo 3f2fccb999 Merge pull request #7771 from samuele3hu/v3_3_module 
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
 2014-08-14 18:33:53 +08:00
yangxiao ab783d2702 merge cocos2d 2014-08-14 17:12:39 +08:00
samuele3hu 02da839798 Make lua-template-default support all modules 2014-08-14 16:54:33 +08:00