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

27967 Commits

Author SHA1 Message Date
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
CocosRobot 611ec0a4a5 [AUTO]: updating luabinding automatically 2015-03-18 05:55:07 +00:00
Huabing.Xu edf785cec3 [ci skip]update version 2015-03-18 13:52:52 +08:00
minggo 465d2dc415 Merge pull request #10934 from pipu/avoid_crash_parse_csd 
Avoid crash during parse .csd file.
 2015-03-18 13:49:52 +08:00
yangxiao 44af57459e add comment 2015-03-18 11:58:36 +08:00
yangxiao 21d581a72c set camera mask when member created 2015-03-18 11:41:43 +08:00
pipu faf9d6b01c Avoid crash during parse .csd file. 2015-03-18 10:28:12 +08:00
minggo be2af44583 update document for CCDirector.h 2015-03-17 22:32:26 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
minggo 44c04153a6 update document for CCDataVisitor.h 2015-03-17 20:54:47 +08:00
minggo 36bf7c6d39 update document for CCAutoreleaseData.h 2015-03-17 20:49:00 +08:00
minggo 5b55e873d0 update document for CCAutoreleasePool.h 2015-03-17 20:15:50 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
XiaoYang 8bbce138f3 Merge pull request #256 from songchengjiang/v3 
fix bugs
 2015-03-17 17:53:46 +08:00
songchengjiang a9e5f8cc4a replace static_cast with dynamic_cast 2015-03-17 17:47:58 +08:00
yangxiao e6770909f2 reset expolosion 2015-03-17 17:47:53 +08:00
yangxiao f24f2d617d Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-03-17 17:45:12 +08:00
yangxiao dced8004e1 reset explosion and fix bug of event handler 2015-03-17 17:44:52 +08:00
songchengjiang 73caf536da fix the bug of lighting shader 2015-03-17 16:43:08 +08:00
XiaoYang 9a0613a652 Merge pull request #255 from lvlonggame/v3 
replace setAdditionalTransform
 2015-03-17 15:48:14 +08:00
lvlong 3ce0449c97 decompose 2015-03-17 15:17:23 +08:00
minggo c89ac9f336 Merge pull request #10924 from CocosRobot/update_lua_bindings_1426573536 
[AUTO]: updating luabinding automatically
 2015-03-17 14:41:52 +08:00
CocosRobot 9df3f57e0d [AUTO]: updating luabinding automatically 2015-03-17 06:28:14 +00:00
minggo 56718294a6 Merge pull request #10921 from CocosRobot/update_cocosfiles_1426573112 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-17 14:19:08 +08:00