Commit Graph

28230 Commits

Author SHA1 Message Date
minggo 18ba721e97 [ci skip]update CHANGELOG 2015-03-25 13:40:58 +08:00
minggo 518536964f Merge pull request #11142 from CocosRobot/update_lua_bindings_1427255864
[AUTO]: updating luabinding automatically
2015-03-25 13:36:49 +08:00
minggo 326233ab02 Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash
Avoid crash during parse TextAtlas.
2015-03-25 13:36:28 +08:00
CocosRobot 1ced296b58 [AUTO]: updating luabinding automatically 2015-03-25 03:59:57 +00:00
minggo b9ce1e6834 Merge pull request #11140 from natural-law/v3
[ci skip] Support compile & run test projects with cocos2d-console on wp8.
2015-03-25 11:54:27 +08:00
zhangbin 30819193a4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-25 11:45:41 +08:00
minggo 5604c98558 Merge pull request #11122 from chengstory/AvoidTimelineCrash
Avoid timeline crash when custom widget is placed in scene.
2015-03-25 11:44:54 +08:00
zhangbin 7aaf122a41 Support compile & run test projects with cocos2d-console on wp8. 2015-03-25 11:42:55 +08:00
minggo 597d8d025b Merge pull request #11132 from andyque/adjust-jenkins-to-use-release-build
use release build in windows slaves
2015-03-25 11:41:31 +08:00
zhukaixy 2ebc854335 Modify code style 2015-03-25 11:36:11 +08:00
minggo d67bd549f1 Merge pull request #11135 from fusijie/cocosapi
[ci skip]add comments.
2015-03-25 11:10:31 +08:00
minggo 51329ac130 Merge pull request #11136 from WenhaiLin/v3-doxygen
[ci skip]Update comments.
2015-03-25 11:10:08 +08:00
minggo 3bd86668e6 Merge pull request #11134 from CocosRobot/update_lua_bindings_1427248660
[AUTO]: updating luabinding automatically
2015-03-25 11:09:31 +08:00
WenhaiLin f13065a038 [ci skip]Update comments 2015-03-25 11:07:11 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +08:00
Jacky 8b57b66f16 add comments. 2015-03-25 10:13:17 +08:00
minggo 27c319b076 [ci skip]update CHANGELOG 2015-03-25 10:10:57 +08:00
lvlong 7efd4c2df6 replace setAdditionnalTransform() 2015-03-25 10:04:51 +08:00
CocosRobot e4f3878fe5 [AUTO]: updating luabinding automatically 2015-03-25 01:59:43 +00:00
minggo 1f4d7c598f Merge pull request #11126 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
2015-03-25 09:53:28 +08:00
andyque 29b97ad235 use release build in windows slaves 2015-03-25 09:51:39 +08:00
minggo bed7746459 Merge pull request #11120 from fusijie/cocosapi
[ci skip]add comments.
2015-03-25 09:49:52 +08:00
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