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

27849 Commits

Author SHA1 Message Date
Huabing.Xu 431b3593a7 [ci skip] update comments CCQuadCommand.h 2015-03-18 20:12:34 +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
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
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
CocosRobot 2b14d11bb9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-17 06:18:34 +00:00
minggo aa573a9553 Merge pull request #10904 from pipu/fixed_widget_reader_actiontag 
Optimize parse action tag for node and widget.
 2015-03-17 14:18:22 +08:00
minggo f51e2b9537 Merge pull request #10912 from perminovVS/v3-dev-console 
Create Console before any sub systems
 2015-03-17 14:17:35 +08:00
minggo 5b2ba424b1 Merge pull request #10918 from CocosRobot/update_cocosfiles_1426563205 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-17 14:16:38 +08:00
minggo 3aa522eca2 Merge pull request #10905 from MSOpenTech/v3-wp8-fix 
V3 Update Angle to support gl_PointSize on Windows Phone 8.1
 2015-03-17 14:15:56 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
Dale Stammen ec50e653c4 updated version to 35 2015-03-16 21:21:42 -07:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
CocosRobot d2a853c72b [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-17 03:33:26 +00:00
minggo 7e5708cac6 Merge pull request #10917 from yangws/v3 
Add doxygen config for white book and cocos/doxygen_modules.h for doc mu...
 2015-03-17 11:32:07 +08:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00