minggo
|
78ff70a8f6
|
Merge pull request #10972 from pipu/fix_armaturenode_load
Avoid crash during parse armature node.
|
2015-03-19 22:10:34 +08:00 |
minggo
|
d28e5d61b6
|
Merge pull request #10998 from dingpinglv/Iss_Annotate
[ci skip] Added js annotates to -x
|
2015-03-19 22:09:43 +08:00 |
minggo
|
8e019de83b
|
Merge pull request #11003 from fusijie/cocosapi
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
|
2015-03-19 22:09:20 +08:00 |
minggo
|
f4e2469730
|
update document for CCValue.h
|
2015-03-19 21:52:56 +08:00 |
minggo
|
7b6502c78b
|
[ci skip]update AUTHORS
|
2015-03-19 21:49:24 +08:00 |
minggo
|
0648ac7ca0
|
Merge pull request #11004 from SuYaoHui/cocosapi
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
|
2015-03-19 21:47:32 +08:00 |
dingpinglv
|
de73f25e42
|
Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h
|
2015-03-19 21:44:44 +08:00 |
SuYaohui
|
5e236fd753
|
progressTimer,ApplicationProtocol
|
2015-03-19 21:42:31 +08:00 |
Jacky
|
85c04ff605
|
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
|
2015-03-19 21:41:40 +08:00 |
dingpinglv
|
41822ef131
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
|
2015-03-19 21:27:52 +08:00 |
dingpinglv
|
3413c716df
|
Issue: Added js annotates to CCScheduler.h
|
2015-03-19 21:25:09 +08:00 |
minggo
|
43a5a65ff4
|
[ci skip]update CHANGELOG
|
2015-03-19 21:24:36 +08:00 |
minggo
|
a9cafb14cb
|
[ci skip]update CHANGELOG
|
2015-03-19 21:23:16 +08:00 |
minggo
|
8e32933dd3
|
Merge pull request #10340 from seobyeongky/network_bugfix2
receive content data even though status code is not 2xx
|
2015-03-19 21:12:51 +08:00 |
minggo
|
1589d982f0
|
Merge pull request #11002 from MSOpenTech/v3-wp8-fix
V3 Added missing PerformanceParticle3DTest.cpp to WP8 cpp-tests project
|
2015-03-19 21:04:56 +08:00 |
SuYaohui
|
c295952c71
|
NodeGrid,Config,NS,ApplicationProtocol
|
2015-03-19 21:03:28 +08:00 |
dingpinglv
|
c03703ddab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
|
2015-03-19 21:01:17 +08:00 |
dingpinglv
|
069791a0a2
|
Corrected a wrong indent in CCSpriteFrameCache.h
|
2015-03-19 21:00:33 +08:00 |
Dale Stammen
|
73e01c0d5e
|
added missing PerformanceParticle3DTest.cpp to WP8 project
|
2015-03-19 05:53:37 -07:00 |
minggo
|
c9aff8dcd3
|
Merge pull request #11001 from CocosRobot/update_cocosfiles_1426768935
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-19 20:45:11 +08:00 |
minggo
|
35078b70da
|
Merge pull request #10997 from CocosRobot/update_lua_bindings_1426768076
[AUTO]: updating luabinding automatically
|
2015-03-19 20:44:33 +08:00 |
CocosRobot
|
182d4958f8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-19 12:42:16 +00:00 |
minggo
|
b01c515aba
|
Merge pull request #11000 from yangws/v3
Add MainPageWhiteBook.h, and move doxygen_modules.h to docs.
|
2015-03-19 20:40:29 +08:00 |
CocosRobot
|
21e46efb00
|
[AUTO]: updating luabinding automatically
|
2015-03-19 12:30:15 +00:00 |
Vincent Yang
|
85a26a32c3
|
Modify doxygen_white_book.h for ignore some macros like this: CC_DLL...
|
2015-03-19 20:29:31 +08:00 |
dingpinglv
|
67169443df
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
Conflicts:
cocos/audio/include/SimpleAudioEngine.h
|
2015-03-19 20:28:29 +08:00 |
dingpinglv
|
baa723a899
|
Issue : Added js annotates to CCController.h
|
2015-03-19 20:26:44 +08:00 |
Vincent Yang
|
93ccdae7df
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-03-19 20:22:59 +08:00 |
Vincent Yang
|
ca4c71bf0e
|
Add MainPageWhiteBook.h, and move doxygen_modules.h to docs.
|
2015-03-19 20:21:40 +08:00 |
dingpinglv
|
1b179c2b02
|
Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h
|
2015-03-19 20:20:16 +08:00 |
minggo
|
0b19781d8c
|
Merge pull request #10989 from pipu/serialize_InnerActionSpeed
Serialize attribute "InnerActionSpeed" during create from .csd file.
|
2015-03-19 20:11:34 +08:00 |
minggo
|
1539b5de78
|
Merge pull request #10991 from VisualSJ/v3-docs
Add javascript notes...
|
2015-03-19 20:09:41 +08:00 |
minggo
|
8075cc1602
|
Merge pull request #10986 from samuele3hu/v3_5_comment
[ci skip]Update comments of some header files
|
2015-03-19 20:01:43 +08:00 |
minggo
|
26139a66f1
|
Merge pull request #10988 from dabingnn/v3_releaseNotes
[ci skip]update releaseNotes
|
2015-03-19 20:01:08 +08:00 |
minggo
|
f3e518b103
|
Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash
fix crash problem when switch to a new scene after call RenderTexture::s...
|
2015-03-19 20:00:31 +08:00 |
minggo
|
1aec5a9508
|
Merge pull request #10980 from super626/v3
3d particle performance test
|
2015-03-19 20:00:07 +08:00 |
minggo
|
5601eed02f
|
Merge pull request #10987 from samuele3hu/v3_5_f_bug
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
|
2015-03-19 19:59:28 +08:00 |
minggo
|
d2936253c0
|
Merge pull request #10990 from calfjohn/v3
[ci skip] Add documents for physics
|
2015-03-19 19:58:18 +08:00 |
dingpinglv
|
7a50af4407
|
Issue : added js annotate to CCLight.h
|
2015-03-19 19:54:46 +08:00 |
dingpinglv
|
194c8d8f17
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
|
2015-03-19 19:46:01 +08:00 |
VisualSJ
|
f87b06a1c8
|
Add javascript notes...
cocos/2d/CCAction.h
cocos/2d/CCActionCamera.h
cocos/2d/CCActionCatmullRom.h
cocos/2d/CCActionInstant.h
cocos/2d/CCActionInterval.h
cocos/2d/CCActionManager.h
cocos/audio/include/AudioEngine.h
cocos/audio/include/SimpleAudioEngine.h
|
2015-03-19 18:41:11 +08:00 |
yangxiao
|
0d045feec5
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-19 18:10:41 +08:00 |
yangxiao
|
6c6fffc847
|
modify enum to static int
|
2015-03-19 18:10:16 +08:00 |
calfjohn
|
97048c8fdc
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-03-19 18:00:08 +08:00 |
calfjohn
|
c2cded367c
|
add document for physics
|
2015-03-19 17:58:08 +08:00 |
pipu
|
e9b6ca724d
|
Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator.
|
2015-03-19 17:54:26 +08:00 |
Huabing.Xu
|
18ac6039d7
|
Merge pull request #10984 from CocosRobot/update_lua_bindings_1426753617
[AUTO]: updating luabinding automatically
|
2015-03-19 17:53:08 +08:00 |
Huabing.Xu
|
18da1ceef7
|
[ci skip]update releaseNotes
|
2015-03-19 17:38:52 +08:00 |
samuele3hu
|
5a5acc624a
|
issue #10875: fix a lua bindings bug for GLProgram::setUniformLocationF32
|
2015-03-19 17:31:57 +08:00 |
samuele3hu
|
1eb1057875
|
Update comments of some header files
|
2015-03-19 16:59:21 +08:00 |