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 |
minggo
|
85530648a7
|
Merge pull request #11180 from andyque/fix-comments
remove unneeded js & lua NA and remove deprecated list from navtree
|
2015-03-27 13:40:54 +08:00 |
minggo
|
de3822c1b6
|
Merge pull request #11190 from dabingnn/v3_comments
V3 comments
|
2015-03-27 13:40:07 +08:00 |
Jacky
|
4edf9e76fd
|
update comments.
|
2015-03-27 12:07:19 +08:00 |
Huabing.Xu
|
0367d752af
|
Merge branch 'v3' into v3_comments
Conflicts:
cocos/renderer/ccShaders.h
|
2015-03-27 12:05:15 +08:00 |
andyque
|
602093e474
|
fix extra @ symbol in Base group
|
2015-03-27 12:01:20 +08:00 |
Wenhai Lin
|
a47cad0354
|
[ci skip]Fixed warnings
|
2015-03-27 11:59:10 +08:00 |
Huabing.Xu
|
3d657df9f6
|
[ci skip]add group base to files in renderer folder
|
2015-03-27 11:54:40 +08:00 |
tangziwen
|
5a76a628d3
|
add some utility functions
|
2015-03-27 11:46:02 +08:00 |
minggo
|
29c5da8429
|
Merge pull request #11189 from SuYaoHui/cocosapi
Add comments
|
2015-03-27 11:46:02 +08:00 |
SuYaohui
|
17bd26e9d4
|
Add comments
|
2015-03-27 11:39:31 +08:00 |
minggo
|
8691602b81
|
Merge pull request #11185 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-27 11:35:11 +08:00 |
Huabing.Xu
|
6cb99312ee
|
[ci skip]add group base to files in math folder
|
2015-03-27 11:34:52 +08:00 |
minggo
|
fe4e6f05dd
|
Merge pull request #11184 from CocosRobot/update_cocosfiles_1427426165
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-27 11:32:12 +08:00 |
andyque
|
813bcc4017
|
Merge branch 'v3' into fix-comments
|
2015-03-27 11:26:46 +08:00 |
Huabing.Xu
|
b22f92635f
|
[ci skip]fix warning for doxygen
|
2015-03-27 11:20:50 +08:00 |
CocosRobot
|
43c030205b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-27 03:16:06 +00:00 |
minggo
|
72f378db71
|
[ci skip]update CHANGELOG
|
2015-03-27 11:15:10 +08:00 |
samuele3hu
|
a1b054911c
|
Update comments of some header files
|
2015-03-27 11:13:28 +08:00 |
minggo
|
d9680b2c74
|
Merge pull request #11178 from calfjohn/v3
[ci skip]fixed doxygen warning for physics and texture2d
|
2015-03-27 11:11:28 +08:00 |
minggo
|
8b4f662ac0
|
Merge pull request #11179 from WenhaiLin/v3-doxygen
[ci skip]Fixed warnings when generating docs by doxygen.
|
2015-03-27 11:10:43 +08:00 |
minggo
|
2ea8b8272a
|
Merge pull request #11177 from CocosRobot/update_lua_bindings_1427423082
[AUTO]: updating luabinding automatically
|
2015-03-27 11:10:19 +08:00 |
Huabing.Xu
|
49bf8d5e13
|
Merge pull request #11181 from dabingnn/v3_comments
V3 comments
|
2015-03-27 11:09:17 +08:00 |
minggo
|
0cab686c00
|
[ci skip]update CHANGELOG
|
2015-03-27 11:08:01 +08:00 |
minggo
|
24aef7c6bb
|
Merge pull request #11164 from super626/texturecube
Texturecube
|
2015-03-27 11:06:28 +08:00 |
Huabing.Xu
|
cbcdef11c3
|
[ci skip]fix warning for doxygen
|
2015-03-27 11:05:01 +08:00 |
Huabing.Xu
|
f18fac48ed
|
[ci skip]fix warning for doxygen
|
2015-03-27 11:03:21 +08:00 |
andyque
|
bc2ffe4e19
|
remove unneeded js & lua NA and remove deprecated list from navtree
|
2015-03-27 11:02:04 +08:00 |
Wenhai Lin
|
fdffad3956
|
[ci skip]Fixed warnings when generating docs by doxygen.
|
2015-03-27 10:52:59 +08:00 |
tangziwen
|
3a3e1e9ad1
|
update terrain test
|
2015-03-27 10:47:52 +08:00 |
calfjohn
|
0af4f9f1ed
|
fixed doxygen warning for physics and texture2d
|
2015-03-27 10:34:01 +08:00 |
CocosRobot
|
c73602a523
|
[AUTO]: updating luabinding automatically
|
2015-03-27 02:26:35 +00:00 |
minggo
|
cbd8cbae70
|
Merge pull request #11176 from natural-law/v3
[ci skip] Solve the warning when generating docs by doxygen.
|
2015-03-27 10:21:27 +08:00 |
zhangbin
|
58bc56f759
|
Solve the warning when generating docs by doxygen.
|
2015-03-27 10:17:33 +08:00 |
tangziwen
|
8b376e511c
|
update Terrain
|
2015-03-27 10:12:24 +08:00 |
minggo
|
25cfecdefc
|
Merge pull request #11175 from CocosRobot/update_lua_bindings_1427386502
[AUTO]: updating luabinding automatically
|
2015-03-27 09:32:28 +08:00 |
yangxiao
|
1d08c514ee
|
do not export getBoneCurves
|
2015-03-27 09:15:45 +08:00 |
CocosRobot
|
a4e633a299
|
[AUTO]: updating luabinding automatically
|
2015-03-26 16:17:35 +00:00 |
minggo
|
eef67aba0a
|
Merge pull request #11174 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-26 23:59:33 +08:00 |
samuele3hu
|
fb085fc2ea
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment
Conflicts:
docs/doxygen_white_book.config
|
2015-03-26 22:29:37 +08:00 |
samuele3hu
|
e0bde0f789
|
Update comments of some header files
|
2015-03-26 22:07:44 +08:00 |