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

29851 Commits

Author SHA1 Message Date
andyque 360098c2cf fix doxygen document generate tool restore doxygen.config file unexpectly 2015-03-23 14:35:38 +08:00
pipu c068e60aa6 Reconstruct ColorFrame. 2015-03-23 13:37:24 +08:00
minggo 341c560378 Merge pull request #11070 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-23 12:05:20 +08:00
zhangbin 5e86152b15 Update the reference of submodule cocos2d-console. 2015-03-23 12:04:14 +08:00
SuYaohui 6310e75071 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-23 11:35:30 +08:00
minggo ffd8ae1b42 [ci skip]update CMakeLists.txt 2015-03-23 11:33:03 +08:00
minggo 27c4104ca7 Merge pull request #11049 from MSOpenTech/v3-wp8-shaders 
Edit V3 updated precompiled shaders for WP8
 2015-03-23 11:28:18 +08:00
minggo f51b8cb951 Merge pull request #11069 from CocosRobot/update_lua_bindings_1427080728 
[AUTO]: updating luabinding automatically
 2015-03-23 11:24:10 +08:00
CocosRobot ef631d743c [AUTO]: updating luabinding automatically 2015-03-23 03:20:47 +00:00
minggo 7e7cef3556 Merge pull request #11066 from super626/v3 
Fix android switch back and foreground bug
 2015-03-23 11:15:17 +08:00
minggo 81c7b84746 [ci skip]update CHANGELOG 2015-03-23 11:11:49 +08:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
XiaoYang fcf6cab884 Merge pull request #262 from tangziwen/v3_abc 
fix UVAnimation test while switching back to foreground
 2015-03-23 10:38:11 +08:00
Dale Stammen 63f3bf1a37 Merge branch 'v3' into v3-wp8-shaders 2015-03-22 19:20:05 -07:00
tangziwen e213cd1747 fix UVAnimation test while switching back to foreground 2015-03-23 10:19:00 +08:00
minggo 3e0d5f2772 Merge pull request #11065 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-23 10:15:26 +08:00
zhangbin eb95bbce02 Update the reference of submodule cocos2d-console. 2015-03-23 10:10:35 +08:00
minggo 3d3bfa3cdb Merge pull request #11026 from pipu/update_TestAnimation_resources 
Update resources of Test TestTimelineProjectNode.
 2015-03-23 09:35:14 +08:00
Zhe Wang 2d6d7f42f5 Update CHANGELOG 
fix a typo, Romanian languange -> Romanian language
 2015-03-21 22:47:00 +08:00
Jacky cc09b84153 add comments. 2015-03-21 18:02:56 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
Huabing.Xu bbfc7dab26 Merge pull request #11048 from samuele3hu/v3_src 
[ci skip]Update plugin submodule for v3.5
 2015-03-21 14:56:02 +08:00
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
samuele3hu 84c81750be Update plugin submodule for v3.5 2015-03-21 14:05:50 +08:00
Huabing.Xu bb899be9c9 Merge pull request #11045 from CocosRobot/update_lua_bindings_1426913633 
[AUTO]: updating luabinding automatically
 2015-03-21 13:28:42 +08:00
CocosRobot fd7ac235ce [AUTO]: updating luabinding automatically 2015-03-21 04:55:48 +00:00
Huabing.Xu 2218013319 Merge pull request #11043 from dingpinglv/Iss_Annotate 
[ci skip] added js annotates to CCLayer.h, CCNode.h
 2015-03-21 12:50:39 +08:00
dingpinglv ef56088886 Issue: Added js Annotates to CCNode.h 2015-03-21 11:07:39 +08:00
dingpinglv b30b6db09b Issue: added js annotates to CCLayer.h 2015-03-21 10:23:42 +08:00
zhukaixy 52280e6376 add 3d test case(skybox and texture cube) for lua project 2015-03-20 17:53:05 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
pipu 0bdfe99731 Update resources of Test TestTimelineProjectNode. 2015-03-20 17:08:15 +08:00
samuele3hu 865aa886a9 Update comments of some header files 2015-03-20 14:39:33 +08:00
minggo 7c4f8b238d Merge pull request #11014 from pipu/InnerActionSpeed_flatbuffer_data 
Create flat buffer format data for "InnerActionSpeed".
 2015-03-20 13:39:09 +08:00
minggo 14f73851c5 Merge pull request #11018 from CocosRobot/update_lua_bindings_1426827051 
[AUTO]: updating luabinding automatically
 2015-03-20 13:38:52 +08:00
minggo 3424bf8965 Merge pull request #11017 from CocosRobot/update_cocosfiles_1426826965 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-20 13:38:23 +08:00
CocosRobot 7ea110134c [AUTO]: updating luabinding automatically 2015-03-20 04:53:00 +00:00
CocosRobot 342edc5904 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-20 04:49:27 +00:00
minggo b384c68dca Merge pull request #11016 from yangws/v3 
Change module name define in docs/Groups.h.
 2015-03-20 12:47:01 +08:00
Vincent Yang 04c0857be7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-20 11:35:44 +08:00
Vincent Yang 89f538c415 Change module name define in docs/Groups.h, docs/doxygen_modules.h duplicated with group.h, rm it. 2015-03-20 11:31:09 +08:00
Huabing.Xu abaa8dba77 update comments 2015-03-20 11:24:52 +08:00
pipu 8791e36d3f Create flat buffer format data for "InnerActionSpeed". 2015-03-20 11:10:22 +08:00
minggo f3398eafbf Merge pull request #11008 from andyque/change-jenkins-to-use-msbuild 
use msbuild in windows slaves
 2015-03-20 10:38:50 +08:00
andyque a29a298ec3 fix wrong comment 2015-03-20 09:49:34 +08:00
Huabing.Xu d075a2bf86 Merge pull request #11009 from dabingnn/v3_comments 
[ci skip] update comments in renderer folder
 2015-03-20 09:47:30 +08:00
Huabing.Xu 055b71569a [ci skip] update comments in renderer folder 2015-03-20 09:46:08 +08:00
andyque a535d2f5d4 use msbuild in windows slaves 2015-03-20 09:37:06 +08:00
minggo a5eca355fd Merge pull request #11005 from CocosRobot/update_lua_bindings_1426774505 
[AUTO]: updating luabinding automatically
 2015-03-20 09:28:57 +08:00
CocosRobot 7da412a4e1 [AUTO]: updating luabinding automatically 2015-03-19 14:17:17 +00:00