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

8127 Commits

Author SHA1 Message Date
calfjohn 587931faaa Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas. 2015-03-26 15:20:25 +08:00
calfjohn 657f270855 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-23 17:50:53 +08:00
calfjohn ff0e852044 Add document for Texture2D\TextureAtlas\TextureCache 2015-03-23 17:50:22 +08:00
minggo 2923ad6cd6 Merge pull request #11076 from CocosRobot/update_lua_bindings_1427099413 
[AUTO]: updating luabinding automatically
 2015-03-23 16:34:17 +08:00
minggo 3f9862d008 Merge pull request #11075 from CocosRobot/update_lua_bindings_1427099254 
[AUTO]: updating luabinding automatically
 2015-03-23 16:33:07 +08:00
CocosRobot 9f17ed6bed [AUTO]: updating luabinding automatically 2015-03-23 08:32:54 +00:00
CocosRobot 01930b408e [AUTO]: updating luabinding automatically 2015-03-23 08:29:35 +00:00
minggo 3180f21640 Merge pull request #11068 from minggo/add-documentation 
[ci skip]update document for CCValue.h
 2015-03-23 16:25:38 +08:00
minggo c587d19e8b Merge pull request #11059 from SuYaoHui/cocosapi 
add comments.
 2015-03-23 16:24:22 +08:00
minggo 4143eae713 Merge pull request #11061 from fusijie/cocosapi 
add comments.
 2015-03-23 16:23:51 +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
CocosRobot ef631d743c [AUTO]: updating luabinding automatically 2015-03-23 03:20:47 +00:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +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
Dale Stammen fc94659fd5 updated precompiled shaders for WP8 2015-03-20 23:50:48 -07:00
CocosRobot fd7ac235ce [AUTO]: updating luabinding automatically 2015-03-21 04:55:48 +00: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
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +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
CocosRobot 7ea110134c [AUTO]: updating luabinding automatically 2015-03-20 04:53:00 +00: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
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
minggo 78ff70a8f6 Merge pull request #10972 from pipu/fix_armaturenode_load 
Avoid crash during parse armature node.
 2015-03-19 22:10:34 +08:00
minggo d28e5d61b6 Merge pull request #10998 from dingpinglv/Iss_Annotate 
[ci skip] Added js annotates to -x
 2015-03-19 22:09:43 +08:00
minggo 8e019de83b Merge pull request #11003 from fusijie/cocosapi 
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
 2015-03-19 22:09:20 +08:00
minggo f4e2469730 update document for CCValue.h 2015-03-19 21:52:56 +08:00
minggo 0648ac7ca0 Merge pull request #11004 from SuYaoHui/cocosapi 
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
 2015-03-19 21:47:32 +08:00
dingpinglv de73f25e42 Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h 2015-03-19 21:44:44 +08:00
SuYaohui 5e236fd753 progressTimer,ApplicationProtocol 2015-03-19 21:42:31 +08:00
Jacky 85c04ff605 [ci skip]add comments to CCLayer & CCNode & CCConfiguration. 2015-03-19 21:41:40 +08:00
dingpinglv 41822ef131 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:27:52 +08:00
dingpinglv 3413c716df Issue: Added js annotates to CCScheduler.h 2015-03-19 21:25:09 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2 
receive content data even though status code is not 2xx
 2015-03-19 21:12:51 +08:00
SuYaohui c295952c71 NodeGrid,Config,NS,ApplicationProtocol 2015-03-19 21:03:28 +08:00
dingpinglv c03703ddab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 2015-03-19 21:01:17 +08:00
dingpinglv 069791a0a2 Corrected a wrong indent in CCSpriteFrameCache.h 2015-03-19 21:00:33 +08:00
minggo 35078b70da Merge pull request #10997 from CocosRobot/update_lua_bindings_1426768076 
[AUTO]: updating luabinding automatically
 2015-03-19 20:44:33 +08:00
CocosRobot 21e46efb00 [AUTO]: updating luabinding automatically 2015-03-19 12:30:15 +00:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 20:28:29 +08:00
dingpinglv baa723a899 Issue : Added js annotates to CCController.h 2015-03-19 20:26:44 +08:00
Vincent Yang 93ccdae7df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-19 20:22:59 +08:00
Vincent Yang ca4c71bf0e Add MainPageWhiteBook.h, and move doxygen_modules.h to docs. 2015-03-19 20:21:40 +08:00
dingpinglv 1b179c2b02 Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h 2015-03-19 20:20:16 +08:00