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

28308 Commits

Author SHA1 Message Date
minggo 671be8e157 Merge pull request #11131 from natural-law/v3 
[ci skip] Update the group of CCClippingRectangleNode.
 2015-03-25 09:48:41 +08:00
zhangbin 2f7397f6b9 Update the group of CCClippingRectangleNode. 2015-03-25 09:46:00 +08:00
minggo 50040bf4b4 Merge pull request #11129 from dabingnn/v3_comments 
V3 comments
 2015-03-25 09:35:46 +08:00
Huabing.Xu 63a65b1dd1 [ci skip]update comments CCAffineTransform.h 2015-03-24 23:29:41 +08:00
Huabing.Xu d06d575e6e Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments 2015-03-24 23:01:18 +08:00
samuele3hu f3890d3bb3 Update comments of some header files 2015-03-24 21:52:56 +08:00
samuele3hu 020b3ba5cb Update comments of some header files 2015-03-24 21:46:18 +08:00
Huabing.Xu 133955dba1 [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
Huabing.Xu b84c1f2c2c [ci skip]update comments CCGeometry.h 2015-03-24 21:33:55 +08:00
Huabing.Xu e6d1dcef58 Merge pull request #11123 from WenhaiLin/v3-doxygen 
V3 doxygen
 2015-03-24 20:33:17 +08:00
WenhaiLin 89f9ae044d [ci skip]Update comments 2015-03-24 20:29:13 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
zhangcheng e2e0ed0595 Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
Huabing.Xu da9b0cb908 Merge pull request #11121 from dabingnn/v3_comments 
[ci skip]update comments Mat4.h, MathUtil.h, Quaternion.h
 2015-03-24 19:32:40 +08:00
Huabing.Xu 9923a0b575 [ci skip]update comments Mat4.h, MathUtil.h, Quaternion.h 2015-03-24 19:27:13 +08:00
Jacky 32f37b8701 [ci skip]add comments. 2015-03-24 18:22:52 +08:00
lvlong 5ce4fbe6df merge node transform problem！！！ 2015-03-24 17:59:24 +08:00
minggo 9e9d263a17 Merge pull request #11114 from VisualSJ/v3-docs 
[ci skip] Add javascript notes...
 2015-03-24 17:40:40 +08:00
minggo 6f568c6665 Merge pull request #11109 from CocosRobot/update_lua_bindings_1427185990 
[AUTO]: updating luabinding automatically
 2015-03-24 16:45:10 +08:00
VisualSJ 6590d34bda [ci skip] Add javascript notes... 
cocos/base/CCEventListener.h
  cocos/base/CCEventListenerAcceleration.h
  cocos/base/CCEventListenerController.h
  cocos/base/CCEventListenerCustom.h
  cocos/base/CCEventListenerFocus.h
  cocos/base/CCEventListenerKeyboard.h
  cocos/base/CCEventListenerMouse.h
  cocos/base/CCEventListenerTouch.h
  cocos/base/CCEventMouse.h
  cocos/base/CCEventTouch.h
 2015-03-24 16:37:09 +08:00
CocosRobot 08919a1445 [AUTO]: updating luabinding automatically 2015-03-24 08:35:26 +00:00
minggo e50a71609f Merge pull request #11071 from pipu/reconstruct_ColorFrame 
Reconstruct ColorFrame.
 2015-03-24 16:29:55 +08:00
lvlong 5c20d49cd7 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-03-24 16:07:42 +08:00
lvlong 6e6b2c1869 fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
zhukaixy 3b8a796404 config project config file for cocos2d-win8.1-universal 2015-03-24 16:01:06 +08:00
pipu 90da9dbee5 Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
zhukaixy aa0193044b discard modify of lua_cocos2dx_3d_auto.cpp 2015-03-24 15:49:24 +08:00
zhukaixy 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08:00
minggo 9cb02c800a Merge pull request #11102 from WenhaiLin/v3-doxygen 
[ci skip]Update comments
 2015-03-24 15:15:40 +08:00
minggo cc5419e7cd Merge pull request #11099 from andyque/add-jenkins-daily-build-status-icon-v3 
add Jenkins daily build status
 2015-03-24 15:14:08 +08:00
WenhaiLin 3b555be91a [ci skip]Update comments 2015-03-24 15:13:05 +08:00
andyque 7807bb0b6e add wp8 node status icon 2015-03-24 15:08:31 +08:00
andyque 1b053a6eb2 add wp8 build node 2015-03-24 14:54:08 +08:00
WenhaiLin 9e7e819eab [ci skip]Update comments 2015-03-24 14:43:54 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
andyque 27155afe43 fix format 2015-03-24 14:12:16 +08:00
minggo 8f9eb6ce22 Merge pull request #11097 from CocosRobot/update_lua_bindings_1427167387 
[AUTO]: updating luabinding automatically
 2015-03-24 14:01:35 +08:00
andyque 9516f19e6e add Jenkins daily build status 2015-03-24 13:47:12 +08:00
WenhaiLin 8ae81e6c7a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:43:09 +08:00
minggo 6cc8fb4348 Merge pull request #11092 from fusijie/cocosapi 
[ci skip]update headers' module name.
 2015-03-24 11:27:54 +08:00
WenhaiLin 1450dfbc7b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen 2015-03-24 11:26:10 +08:00
CocosRobot 9d886cc5f2 [AUTO]: updating luabinding automatically 2015-03-24 03:25:31 +00:00
minggo df532490d8 Merge pull request #11094 from andyque/add-daily-build-scripts 
[ci skip]add daily build
 2015-03-24 11:19:28 +08:00
minggo a935e7cc07 Merge pull request #11095 from minggo/add-documentation 
[ci skip]add more documentation
 2015-03-24 11:17:55 +08:00
minggo 4973de2b25 add more doxygen document 2015-03-24 11:15:40 +08:00
andyque 920e30386e do cleanup 2015-03-24 11:13:23 +08:00
andyque b8bc7ce3f3 add daily build 2015-03-24 11:10:51 +08:00
minggo 14574bdd41 add doxygen comment of CCFileUtils.h 2015-03-24 10:34:44 +08:00
Jacky af12891cfc [ci skip]update headers' module name. 2015-03-24 10:34:41 +08:00
yangxiao fad4fb8e6f fix memory leak 2015-03-24 10:22:55 +08:00