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

175 Commits

Author SHA1 Message Date
CocosRobot 7cb2cd8608 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-11 02:16:23 +00:00
dualface b49d2351ff update lua-template-default 2014-10-11 02:55:04 +08:00
CocosRobot 127b8acd14 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 14:23:42 +00:00
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +08:00
CocosRobot 80a92066c2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 08:42:41 +00:00
CocosRobot 0b5122a11b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 05:49:41 +00:00
CocosRobot 79e641b3ff [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 02:06:14 +00:00
SunLightJuly 1062dec335 modified project files and make files 2014-10-08 18:44:58 +08:00
CocosRobot 75f21f9c10 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-08 01:41:20 +00:00
CocosRobot d090576b94 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-06 13:11:39 +00:00
CocosRobot 181ef40285 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 07:10:16 +00:00
CocosRobot f834ae8d07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 03:15:35 +00:00
minggo d1e41c771b Merge pull request #8162 from super626/light 
3D Light
 2014-09-30 11:13:59 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
CocosRobot 2f35269bf9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 18:08:55 +00:00
CocosRobot 13b165cf75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 10:31:52 +00:00
yangxiao e8904454e9 add to template 2014-09-28 16:08:05 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
yangxiao 1e5a02df2b add to template 2014-09-26 23:13:20 +08:00
CocosRobot 87c04a3e5d [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-26 07:00:12 +00:00
CocosRobot 1f2fc054fe [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-25 10:05:55 +00:00
CocosRobot e0d14458a5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-25 05:43:04 +00:00
CocosRobot 02d343fefc [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 09:03:33 +00:00
CocosRobot 78b51b3ffd [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 05:43:25 +00:00
CocosRobot 671739e9a8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 02:57:48 +00:00
CocosRobot 2c1649f773 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-23 01:26:04 +00:00
CocosRobot 93bfc08d67 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-22 01:32:19 +00:00
CocosRobot 34f679a88a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 19:27:41 +00:00
CocosRobot 5e936ec8ca [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 05:46:24 +00:00
CocosRobot dcdabb404a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 03:11:35 +00:00
CocosRobot 827679099c [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 08:31:19 +00:00
minggo bb0b7a9b8a Merge pull request #7950 from super626/billboard 
3D BillBoard
 2014-09-11 16:29:05 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
CocosRobot 974e810bb2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 07:48:14 +00:00
CocosRobot 11005a6ce9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 06:48:54 +00:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
CocosRobot deef5cb3d7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 06:07:55 +00:00
CocosRobot 15254a5ddb [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 01:50:11 +00:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
yangxiao d183e64c83 add to template 2014-09-04 16:52:45 +08:00
CocosRobot 6bd05770e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 06:00:43 +00:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00
CocosRobot 4b21972d8b [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 05:42:22 +00:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
CocosRobot 071aedaa51 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 02:56:25 +00:00
CocosRobot 1ec9933045 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 05:37:45 +00:00
CocosRobot 61a3c80cb9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 04:05:23 +00:00
CocosRobot 2dea7c3a18 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 03:26:30 +00:00
Huabing.Xu 05d0e04073 [ci skip] update template for triangles command 2014-09-02 15:05:21 +08:00
CocosRobot d0ac64b2e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-29 05:43:47 +00:00