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

28090 Commits

Author SHA1 Message Date
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document 
[ci skip]Update document
 2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
CocosRobot b7881eab88 [AUTO]: updating luabinding automatically 2015-03-18 14:02:42 +00:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
 2015-03-18 21:58:07 +08:00
minggo 8306aaaab2 Merge pull request #10955 from dabingnn/v3_comments 
[ci skip] update comments CCRenderCommand.h
 2015-03-18 21:48:47 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi 
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
 2015-03-18 21:48:28 +08:00
minggo a9f13148f4 Merge pull request #10961 from minggo/add-documentation 
[ci skip]update document for ccUtils.h
 2015-03-18 21:46:20 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
minggo 7f825d3dae update document for ccUtils.h 2015-03-18 21:45:00 +08:00
VisualSJ 3576df4b89 Add javascript notes... 
cocos/base/CCDirector.h
 2015-03-18 21:39:50 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs 
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
 2015-03-18 21:38:56 +08:00
minggo bf0d48e483 Merge pull request #10957 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 21:33:13 +08:00
minggo 0267faa7d1 Merge pull request #10958 from minggo/add-documentation 
[ci skip]update document for CCUserDefault.h
 2015-03-18 21:27:13 +08:00
minggo 85811bd710 update document for CCUserDefault.h 2015-03-18 21:24:31 +08:00
zhangbin f31a833df4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 21:10:17 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08:00
VisualSJ cb50c7d89a Add javascript notes... 
cocos/2d/CCActionPageTurn3D.h
  cocos/base/CCAutoreleasePool.h
  cocos/base/CCData.h
 2015-03-18 20:51:18 +08:00
minggo 660cfdf964 Merge pull request #10954 from minggo/add-documentation 
[ci skip]Add documentation
 2015-03-18 20:43:33 +08:00
Jacky 2d50327323 update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache 2015-03-18 20:40:29 +08:00
minggo 19fc6a1495 update document for CCScheduler.h 2015-03-18 20:37:43 +08:00
minggo 10703bce66 Merge pull request #10952 from SuYaoHui/cocosapi 
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
 2015-03-18 20:33:00 +08:00
minggo cae0561110 Merge pull request #10950 from dabingnn/v3_comments 
[ci skip] update comments CCTrianglesCommand.h
 2015-03-18 20:32:13 +08:00
minggo dc6fe01ebd Merge pull request #10947 from CocosRobot/update_cocosfiles_1426674503 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-18 20:31:20 +08:00
Huabing.Xu 0c8218581f [ci skip] update comments CCRenderCommand.h 2015-03-18 20:30:52 +08:00
SuYaohui 31944da08c [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:26:16 +08:00
Huabing.Xu 431b3593a7 [ci skip] update comments CCQuadCommand.h 2015-03-18 20:12:34 +08:00
calfjohn e67a57512f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 20:10:16 +08:00
SuYaohui ee8776f041 [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:07:00 +08:00
Huabing.Xu a87c5755e9 [ci skip] update comments CCTrianglesCommand.h 2015-03-18 19:52:08 +08:00
Huabing.Xu 305e5b63ec Merge pull request #10949 from dabingnn/v3_comments 
[ci skip]adjust comments
 2015-03-18 19:32:50 +08:00
Huabing.Xu 4ae4500a68 [ci skip]adjust comments 2015-03-18 19:32:10 +08:00
CocosRobot f0a8fcd282 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-18 10:28:24 +00:00
minggo 359e25327d Merge pull request #10946 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 18:25:31 +08:00
zhangbin b55916c283 Update comments of some header files. 2015-03-18 18:15:34 +08:00
minggo 3f09c15133 Merge pull request #10943 from dabingnn/v3_comments 
[ci skip]update comments CCVertexIndexData.h
 2015-03-18 18:01:16 +08:00
Huabing.Xu fb1d9899c7 [ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h 2015-03-18 17:40:10 +08:00
Huabing.Xu a71fb9f946 [ci skip]update comments CCVertexIndexBuffer.h 2015-03-18 17:18:25 +08:00
pipu e7c89dadf1 Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
calfjohn 83e69f4532 add comments for PhysicsWorld 2015-03-18 16:35:38 +08:00
minggo 0408fc0667 update document for CCRef.h 2015-03-18 15:02:03 +08:00
Huabing.Xu eb2786f40d [ci skip]update comments CCVertexIndexData.h 2015-03-18 14:43:44 +08:00
minggo aa5f257243 Merge pull request #10938 from minggo/add-documentation 
[ci skip]Add documentation
 2015-03-18 14:11:30 +08:00
minggo 723244f62d Merge pull request #10932 from lyubomirv/v3-bulgarian 
Added Bulgarian language.
 2015-03-18 14:01:26 +08:00
minggo 5271c75c11 Merge pull request #10936 from super626/v3 
Camera mask for label
 2015-03-18 14:00:44 +08:00
minggo eeebe97547 Merge pull request #10937 from CocosRobot/update_lua_bindings_1426657990 
[AUTO]: updating luabinding automatically
 2015-03-18 13:57:08 +08:00