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
minggo
9976885d37
Merge pull request #11079 from fusijie/cocosapi
...
add comments.
2015-03-24 09:50:19 +08:00
minggo
73a3051417
Merge pull request #11087 from CocosRobot/update_lua_bindings_1427121273
...
[AUTO]: updating luabinding automatically
2015-03-24 09:49:54 +08:00
minggo
13062a36fb
Merge pull request #11088 from minggo/disable-travis-building
...
[ci skip]Disable travis building
2015-03-24 09:46:22 +08:00
minggo
e234b1ed9a
disable travis building
2015-03-24 09:45:03 +08:00
CocosRobot
0fb2aeb2b2
[AUTO]: updating luabinding automatically
2015-03-23 14:37:03 +00:00
minggo
2dfc0e11db
Merge pull request #11081 from VisualSJ/v3-docs
...
[ci skip] Add javascript notes...
2015-03-23 22:18:34 +08:00
minggo
67e0cd20d2
Merge pull request #11080 from SuYaoHui/cocosapi
...
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
2015-03-23 22:18:00 +08:00
WenhaiLin
78a8ba7f98
[ci skip]Update comments
2015-03-23 22:17:59 +08:00
minggo
7f60b1cea2
Merge pull request #11078 from calfjohn/v3
...
[ci skip] Add documents for Texture2D\TextureAtlas\TextureCache
2015-03-23 22:16:56 +08:00
minggo
e86e954abf
add doxygen comment for CCVector.h
2015-03-23 22:13:04 +08:00
Huabing.Xu
e3231db0c0
Merge pull request #11083 from dabingnn/v3_comments
...
[ci skip]update comments Vec2/3/4.h TransformUtils.h
2015-03-23 21:50:33 +08:00
Huabing.Xu
92b110ce25
[ci skip]update comments Vec2/3/4.h TransformUtils.h
2015-03-23 21:49:36 +08:00
Huabing.Xu
b14cf9b775
Merge pull request #11082 from dabingnn/v3_comments
...
V3 comments
2015-03-23 21:48:00 +08:00
Huabing.Xu
044c954155
[ci skip] update comments CCGLGroupCommand.h
2015-03-23 21:36:01 +08:00
Huabing.Xu
027106c9ee
[ci skip] update comments CCGLProgramStateCache.h, CCPrimitive.h CCPrimitiveCommand.h
2015-03-23 21:19:02 +08:00
Zhe Wang
8e2e1e5723
Add comments of async load, to avoid confusions of developers.
2015-03-23 20:58:16 +08:00
Zhe Wang
0adedc7a75
Update CHANGELOG
...
fix some typos and English syntax error. Well, my English is also poor. Native English speakers, please feel free to pull request to this changelog if you find something wrong.
2015-03-23 20:51:08 +08:00
Huabing.Xu
126186e413
[ci skip]update comments CCMathBase.h CCGLProgramState.h CCRenderer.h
2015-03-23 20:30:37 +08:00
VisualSJ
b5fa6d2e95
[ci skip] Add javascript notes...
...
cocos/2d/CCMotionStreak.h
cocos/2d/CCParticleBatchNode.h
cocos/2d/CCParticleExamples.h
cocos/2d/CCParticleSystem.h
cocos/2d/CCParticleSystemQuad.h
cocos/2d/CCTransition.h
cocos/2d/CCTransitionPageTurn.h
cocos/base/CCConfiguration.h
cocos/base/CCTouch.h
2015-03-23 20:27:13 +08:00
Huabing.Xu
2dde1e69e3
Merge branch 'v3' into v3_comments
2015-03-23 20:00:31 +08:00
Jacky
7f41b091e0
add comments.
2015-03-23 18:39:27 +08:00
SuYaohui
d8a033c2ef
Action,Sprite,TmxTiledMap,UTF8,GLView
2015-03-23 18:37:28 +08:00
calfjohn
657f270855
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-03-23 17:50:53 +08:00
calfjohn
ff0e852044
Add document for Texture2D\TextureAtlas\TextureCache
2015-03-23 17:50:22 +08:00
minggo
2923ad6cd6
Merge pull request #11076 from CocosRobot/update_lua_bindings_1427099413
...
[AUTO]: updating luabinding automatically
2015-03-23 16:34:17 +08:00
minggo
3f9862d008
Merge pull request #11075 from CocosRobot/update_lua_bindings_1427099254
...
[AUTO]: updating luabinding automatically
2015-03-23 16:33:07 +08:00
CocosRobot
9f17ed6bed
[AUTO]: updating luabinding automatically
2015-03-23 08:32:54 +00:00
CocosRobot
01930b408e
[AUTO]: updating luabinding automatically
2015-03-23 08:29:35 +00:00
minggo
3180f21640
Merge pull request #11068 from minggo/add-documentation
...
[ci skip]update document for CCValue.h
2015-03-23 16:25:38 +08:00
minggo
47b7bcf01f
Merge pull request #11072 from andyque/fix-doxygen-release-tool
...
[ci skip]fix doxygen document generate tool restore doxygen.config file
2015-03-23 16:24:48 +08:00
minggo
c587d19e8b
Merge pull request #11059 from SuYaoHui/cocosapi
...
add comments.
2015-03-23 16:24:22 +08:00
minggo
4143eae713
Merge pull request #11061 from fusijie/cocosapi
...
add comments.
2015-03-23 16:23:51 +08:00
minggo
073910fd1a
Merge pull request #11074 from natural-law/v3
...
[ci skip] Update the reference of submodule cocos2d-console.
2015-03-23 16:11:09 +08:00
zhangbin
e457cb47d7
Update the reference of submodule cocos2d-console.
2015-03-23 16:09:43 +08:00
pipu
787225ce21
Make _alpha of ColorFrame become deprecated attribute.
2015-03-23 15:45:32 +08:00