Commit Graph

28837 Commits

Author SHA1 Message Date
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments
Conflicts:
	cocos/base/CCIMEDelegate.h
2015-03-30 10:56:42 +08:00
minggo d437ce3e59 Merge pull request #11208 from samuele3hu/v3_5_comment
Update Sprite3DCubeMap  lua test case and the related bindings-generator submodule
2015-03-30 10:48:36 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube
Texturecube bug fix
2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3
node animation support
2015-03-30 09:32:36 +08:00
minggo 73279e3b3f Merge pull request #11205 from WenhaiLin/v3-doxygen
[ci skip]Update comments.
2015-03-30 09:31:36 +08:00
minggo 85f80fefe5 Merge pull request #11209 from VisualSJ/v3-docs
[ci skip] Add javascript notes...
2015-03-30 09:30:29 +08:00
XiaoYang 2142c9341c Merge pull request #268 from tangziwen/terrain
update Terrain
2015-03-30 09:18:35 +08:00
VisualSJ 875b5d95f4 [ci skip] Add javascript notes...
cocos/ui/UIListView.h
  cocos/ui/UILoadingBar.h
  cocos/ui/UIPageView.h
  cocos/ui/UIRelativeBox.h
  cocos/ui/UIRichText.h
  cocos/ui/UIScale9Sprite.h
  cocos/ui/UIScrollView.h
  cocos/ui/UISlider.h
2015-03-28 16:02:47 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes...
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
2015-03-28 15:11:51 +08:00
samuele3hu 1a9cf6f6a3 Update the bindings-generator submodule 2015-03-28 15:00:12 +08:00
samuele3hu 921981833e Update Sprite3DCubeMap test case 2015-03-28 14:59:47 +08:00
VisualSJ 9ba82584a9 [ci skip] Add javascript notes...
cocos/2d/CCClippingNode.h
  cocos/2d/CCTMXTiledMap.h
  cocos/2d/CCTMXObjectGroup.h
  cocos/2d/CCTMXLayer.h
  cocos/2d/CCSpriteBatchNode.h
  cocos/2d/CCSprite.h
  cocos/2d/CCRenderTexture.h
  cocos/2d/CCProtectedNode.h
  cocos/2d/CCMenuItem.h
  cocos/2d/CCMenu.h
  cocos/2d/CCLabelAtlas.h
  cocos/2d/CCLabel.h
  cocos/2d/CCGrid.h
  cocos/2d/CCGLBufferedNode.h
  cocos/2d/CCFastTMXTiledMap.h
  cocos/2d/CCFastTMXLayer.h
  cocos/2d/CCDrawingPrimitives.h
  cocos/2d/CCDrawNode.h
  cocos/2d/CCComponentContainer.h
  cocos/2d/CCClippingRectangleNode.h
  cocos/2d/CCTextFieldTTF.h
  cocos/2d/CCTileMapAtlas.h
2015-03-28 14:28:16 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
Wenhai Lin ff3777dfd1 [ci skip]Update comments. 2015-03-27 18:26:14 +08:00
XiaoYang 93437f92d0 Merge pull request #273 from zhukaixy/patch-5
Bugfix: for glcontext recreated
2015-03-27 17:57:07 +08:00
zhukaixy 5bff8f5bf3 Bugfix: for glcontext recreated 2015-03-27 17:20:46 +08:00
minggo b78b0f7238 Merge pull request #11202 from minggo/add-documentation
[ci skip]fix doxygen comment
2015-03-27 17:12:37 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
minggo 8b5a6d9ccc Merge pull request #11196 from tangziwen/doc
3d fix doxygen add to group
2015-03-27 17:09:24 +08:00
XiaoYang dbf86e3e66 Merge pull request #270 from zhukaixy/patch-2
Bugfix: for glcontext recreated
2015-03-27 17:08:51 +08:00
XiaoYang 19c3772882 Merge pull request #272 from zhukaixy/patch-4
Update ccShader_3D_Skybox.frag
2015-03-27 17:08:34 +08:00
minggo c4ac84d4f6 Merge pull request #11200 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
2015-03-27 17:08:26 +08:00
XiaoYang cd2e35d65b Merge pull request #271 from zhukaixy/patch-3
Bugfix: for glcontext recreated
2015-03-27 17:07:58 +08:00
zhukaixy a1bad14c1e Update ccShader_3D_Skybox.frag 2015-03-27 17:07:30 +08:00
minggo af5c0a5648 Merge pull request #11201 from minggo/add-documentation
[ci skip]fix about content
2015-03-27 17:06:03 +08:00
zhukaixy 8a1637e3de Update cube_map.frag 2015-03-27 16:50:59 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
zhukaixy a5bda44f22 Update Sprite3DTest.cpp 2015-03-27 16:47:48 +08:00
minggo e70deabfa3 fix about content 2015-03-27 16:18:28 +08:00
minggo 1ce6044c0d [ci skip]update level information 2015-03-27 16:08:58 +08:00
minggo b6ac2fa422 Merge pull request #11199 from WenhaiLin/v3-doxygen
[ci skip]Update comments
2015-03-27 16:04:25 +08:00
samuele3hu f54512a618 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 2015-03-27 15:59:05 +08:00
Wenhai Lin 6f117c4f49 [ci skip]Update comments 2015-03-27 15:31:42 +08:00
samuele3hu bb225d052e Update comments of some header files 2015-03-27 15:27:08 +08:00
minggo 3c3163d7dd Merge pull request #11193 from CocosRobot/update_lua_bindings_1427435046
[AUTO]: updating luabinding automatically
2015-03-27 15:26:36 +08:00
Wenhai Lin 8f3bbe3c40 [ci skip]Update comments 2015-03-27 15:25:44 +08:00
tangziwen 56c31845ff fix conflict again 2015-03-27 15:25:16 +08:00
tangziwen 12bcdc8868 fix conflict 2015-03-27 15:08:20 +08:00
minggo 7d0a49a98f Merge pull request #11198 from SuYaoHui/cocosapi
[ci skip]Add comment
2015-03-27 15:00:22 +08:00
minggo 5b5c00a8e8 Merge pull request #11197 from minggo/v3
[ci skip]change version, cocos2d-x -> cocos
2015-03-27 14:59:40 +08:00
SuYaohui 3d772df930 Add comment 2015-03-27 14:43:24 +08:00
minggo 0c0404c356 change version, cocos2d-x -> cocos 2015-03-27 14:35:04 +08:00
minggo 9d428d8e48 Merge pull request #11194 from WenhaiLin/v3-doxygen
[ci skip]Fixed warnings
2015-03-27 14:34:26 +08:00
minggo 033a3e09b9 Merge pull request #11191 from fusijie/cocosapi
[ci skip]update comments.
2015-03-27 14:33:49 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
CocosRobot 4785e6e383 [AUTO]: updating luabinding automatically 2015-03-27 05:46:01 +00:00
Jacky d9b0c67f65 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi
Conflicts:
	cocos/2d/CCNode.h
2015-03-27 13:43:38 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00