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

23228 Commits

Author SHA1 Message Date
yangxiao fdc0fad935 tmp work 2014-08-27 14:46:24 +08:00
yangxiao c5515874d5 merge cocos 2014-08-27 11:00:14 +08:00
yangxiao 65b0cca132 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-26 14:37:56 +08:00
XiaoYang 605a7935ab Merge pull request #115 from songchengjiang/light 
Light Shader Optimization
 2014-08-26 14:37:34 +08:00
songchengjiang 3369bb7e51 Replaced Tab Format 2014-08-26 14:25:01 +08:00
songchengjiang cf964d62de Light Shader optimization 2014-08-26 14:18:22 +08:00
yangxiao 03390a4f46 merge cocos 2014-08-26 14:05:59 +08:00
yangxiao 2c6c89e0e9 add .vert to project 2014-08-26 11:19:38 +08:00
XiaoYang 545047e886 Merge pull request #114 from songchengjiang/light 
repaired Action BUG
 2014-08-26 09:44:52 +08:00
songchengjiang 3d59aaf86e Replaced Tab Format 2014-08-26 09:43:11 +08:00
songchengjiang 00085c157f Added skeleton Model 
Light On/Off
 2014-08-25 16:32:15 +08:00
minggo dad69ae62a Merge pull request #7874 from CocosRobot/update_cocosfiles_1408949829 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-25 14:58:13 +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 07cf4d3526 Fix the win32 and android compile error 2014-08-25 14:10:13 +08:00
songchengjiang 1a1ccda3ed repaired Action BUG 2014-08-25 13:58:15 +08:00
minggo f3b552fb29 Merge pull request #7871 from CocosRobot/update_cocosfiles_1408936770 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-25 13:35:49 +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 7ece79e7d3 Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963 
[AUTO]: updating luabinding automatically
 2014-08-25 11:01:27 +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 61aacb536e [ci skip] 2014-08-25 10:56:22 +08:00
CocosRobot 5db16cdc23 [AUTO]: updating luabinding automatically 2014-08-25 02:34:32 +00:00
minggo ec6875de94 Merge pull request #7866 from minggo/update-release-note 
[ci skip]update release note
 2014-08-25 10:30:06 +08:00
minggo 2e74a49b52 update release note 2014-08-25 10:28:07 +08:00
minggo 74fc9931e7 fix compiling error of cpp-tests on linux 2014-08-24 19:12:36 -07:00
yangxiao 9ff6b01881 ios work 2014-08-25 10:05:59 +08:00
samuele3hu c495e5266a Remove useless win32 module project and adjust the related project setting 2014-08-25 09:59:50 +08:00
samuele3hu 1126e950b2 Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases 2014-08-25 09:52:48 +08:00
samuele3hu 281da9f1d7 Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases 2014-08-25 09:51:08 +08:00
samuele3hu 1b985db2ff adjust android.mk for lua-tests 2014-08-25 09:49:16 +08:00
samuele3hu 25aab05b1f Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform 2014-08-25 09:48:14 +08:00
minggo abf4fb2319 [ci skip] 2014-08-25 09:47:13 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08:00
minggo c77121b96d Merge pull request #7863 from zii/v3 
Remove a log
 2014-08-25 09:45:33 +08:00
XiaoYang 69f020aec5 Merge pull request #89 from songchengjiang/light 
Light
 2014-08-25 09:24:05 +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
zii e8a5fc9fef Update CCActionManager.cpp 2014-08-23 17:06:46 +08:00
zii 4763531085 Update CCActionManager.cpp 2014-08-23 17:03:26 +08:00
minggo a224abe7c0 Merge pull request #7861 from CocosRobot/update_cocosfiles_1408722976 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-23 15:32:53 +08:00
minggo c9c0591293 Merge pull request #7862 from dabingnn/v3_PrimitiveReleaseNots 
add primitive release nots
 2014-08-23 15:32:17 +08:00
Huabing.Xu f5aeb9e127 add primitive release nots 2014-08-23 15:10:59 +08:00
CocosRobot b55c174bba [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-22 15:56:17 +00:00
minggo 4dae4bd46a Merge pull request #7860 from minggo/v3 
update external version
 2014-08-22 23:53:20 +08:00
minggo e8a7ffcde1 update external version 2014-08-22 23:52:26 +08:00
minggo 2a511c21b5 Merge pull request #7859 from CocosRobot/update_cocosfiles_1408722054 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-22 23:49:40 +08:00