Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,886 Commits 4 Branches 31 Tags 1.1 GiB
Commit Graph

2786 Commits

Author SHA1 Message Date
yusheng.lu 82c6e623e0 Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters 2015-04-02 10:15:36 +08:00
minggo 6cf344ded6 Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup 
Remove useless (char*) casts in CCTMXXMLParser.cpp
 2015-04-02 09:45:22 +08:00
xiaofeng11 ea8538117b Merge pull request #7 from pipu/remove_CCNodeReader 
Remove CCNodeReader.h/.cpp.
 2015-04-01 14:12:09 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
yusheng.lu 01a091ef2c Delete CCNodeReader for Win8.1 project 2015-04-01 11:49:36 +08:00
minggo eefd06415b Merge pull request #11229 from xiaofeng11/v3 
Add destroyCocosStudio()
 2015-04-01 10:49:49 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments 
Conflicts:
	cocos/base/CCIMEDelegate.h
 2015-03-30 10:56:42 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +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
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
Wenhai Lin 8f3bbe3c40 [ci skip]Update comments 2015-03-27 15:25:44 +08: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
Jacky 4edf9e76fd update comments. 2015-03-27 12:07:19 +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 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 24aef7c6bb Merge pull request #11164 from super626/texturecube 
Texturecube
 2015-03-27 11:06:28 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
zhangbin 58bc56f759 Solve the warning when generating docs by doxygen. 2015-03-27 10:17:33 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
minggo 52d53fd7ee Merge pull request #11148 from andyque/finish-v3-comments 
Add missing comments for UI modules
 2015-03-26 10:02:42 +08:00
andyque 248325d055 Add missing comments for UI modules 
Squashed commit of the following:

commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 17:08:07 2015 +0800

    finish all the documents

commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 09:49:33 2015 +0800

    finish scrollview

commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 21:40:26 2015 +0800

    add UIScale9Sprite comments

    Conflicts:
    	cocos/ui/UIScale9Sprite.h

commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 18:05:02 2015 +0800

    add comments for UIRichText

commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 22:08:26 2015 +0800

    add comments for UIPageView and UIRelativeBox

commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 21:12:27 2015 +0800

    finish loadingbar comments

commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:51:30 2015 +0800

    finished UiListView

commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:06:10 2015 +0800

    add comments for LayoutManager and LayoutParameter.

commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 17:09:17 2015 +0800

    finish comments for UILayoutComponent

commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 14:07:58 2015 +0800

    add missing comments

commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 09:31:51 2015 +0800

    add comments

commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 21:02:36 2015 +0800

    add missing docs for UIButton, UILayout, UIIMageview and UIWidget

commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 14:02:05 2015 +0800

    add missing comments for UIHbox and UIHelper

commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 11:28:32 2015 +0800

    add comments for UICheckbox

commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 00:01:42 2015 +0800

    update coments

commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 20:32:57 2015 +0800

    add comments for UIEditbox

commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:51:20 2015 +0800

    add missing comments for UIEditBox

commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:12:08 2015 +0800

    fix indentation problem

commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:08:46 2015 +0800

    add missing comments for CCIMEDispatcher

commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:57:52 2015 +0800

    add missing documents for CCIMedelegate

commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:43:33 2015 +0800

    add missing documentation for CCTilemapatlas

commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:38:59 2015 +0800

    add missing comments for CCTextfieldttf

commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 22:03:31 2015 +0800

    supplement comments for ProtectedNode

commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:55:03 2015 +0800

    add comments to CCMenuitem.h

commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:36:14 2015 +0800

    add comments to Menu
 2015-03-25 18:17:58 +08:00
minggo 51329ac130 Merge pull request #11136 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-25 11:10:08 +08:00
WenhaiLin 153d697f1a [ci skip]Update comments. 2015-03-25 10:59:04 +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
Huabing.Xu d06d575e6e Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments 2015-03-24 23:01:18 +08:00
Huabing.Xu 133955dba1 [ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h 2015-03-24 21:34:20 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
zhukaixy 3b8a796404 config project config file for cocos2d-win8.1-universal 2015-03-24 16:01:06 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +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
Jacky af12891cfc [ci skip]update headers' module name. 2015-03-24 10:34:41 +08: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
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
SuYaohui d8a033c2ef Action,Sprite,TmxTiledMap,UTF8,GLView 2015-03-23 18:37:28 +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
SuYaohui 6310e75071 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-23 11:35:30 +08:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
Jacky cc09b84153 add comments. 2015-03-21 18:02:56 +08:00
SuYaohui 367fb6ed4c add comments. 2015-03-21 17:06:26 +08:00
dingpinglv ef56088886 Issue: Added js Annotates to CCNode.h 2015-03-21 11:07:39 +08:00
dingpinglv b30b6db09b Issue: added js annotates to CCLayer.h 2015-03-21 10:23:42 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +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 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
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
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
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
minggo 1539b5de78 Merge pull request #10991 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 20:09:41 +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
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
Huabing.Xu 8b04a15ee8 fix crash problem when switch to a new scene after call RenderTexture::saveToFile() 2015-03-19 16:39:45 +08:00
zhangbin f196d213ee Solve the error format of comments in header files. 2015-03-19 15:59:58 +08:00
minggo a8471dd507 Merge pull request #10978 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-19 13:42:48 +08:00
zhangbin d755a7b46a Update comments of some header files. 2015-03-19 13:41:21 +08:00
minggo 1d37016912 Merge pull request #10962 from dingpinglv/Iss_Annotate 
[ci skip] added js annotate to classes
 2015-03-19 11:56:07 +08:00
minggo aec86d7e61 Merge pull request #10967 from VisualSJ/v3-docs 
Add javascript notes...
 2015-03-19 11:52:44 +08:00
minggo b469f460c7 Merge pull request #10968 from WenhaiLin/v3-update-document 
[ci skip]Update document
 2015-03-19 10:46:06 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
VisualSJ 62b3f537ce Add javascript notes...Fixed error 2015-03-19 10:33:11 +08:00
SuYaohui 2edb7f7d50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi 2015-03-19 10:05:24 +08:00
SuYaohui bc2b897dc6 ProgressTimer 2015-03-19 10:00:30 +08:00
dingpinglv 9be573e92f Added js annotate to CCSpriteFrameCache.h 2015-03-18 22:24:03 +08:00
dingpinglv 4bb78a2eec Added js annotate to CCScene.h 2015-03-18 22:08:50 +08:00
dingpinglv ee44f024f1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/2d/CCActionGrid.h
	cocos/2d/CCAnimation.h
	cocos/2d/CCAnimationCache.h
	cocos/base/CCRef.h
 2015-03-18 21:58:07 +08:00
minggo ddb6230c13 Merge pull request #10953 from fusijie/cocosapi 
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
 2015-03-18 21:48:28 +08:00
dingpinglv a99c2c7893 Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h 2015-03-18 21:45:58 +08:00
VisualSJ 785214ae12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs 
Conflicts:
	cocos/base/CCAutoreleasePool.h
	cocos/base/CCData.h
 2015-03-18 21:38:56 +08:00
zhangbin f31a833df4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-18 21:10:17 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08:00
VisualSJ cb50c7d89a Add javascript notes... 
cocos/2d/CCActionPageTurn3D.h
  cocos/base/CCAutoreleasePool.h
  cocos/base/CCData.h
 2015-03-18 20:51:18 +08:00
Jacky 2d50327323 update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache 2015-03-18 20:40:29 +08:00
SuYaohui 31944da08c [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:26:16 +08:00
SuYaohui ee8776f041 [ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode 2015-03-18 20:07:00 +08:00
minggo 359e25327d Merge pull request #10946 from natural-law/v3 
[ci skip] Update comments of some header files.
 2015-03-18 18:25:31 +08:00
zhangbin b55916c283 Update comments of some header files. 2015-03-18 18:15:34 +08:00
minggo 5271c75c11 Merge pull request #10936 from super626/v3 
Camera mask for label
 2015-03-18 14:00:44 +08:00
yangxiao 44af57459e add comment 2015-03-18 11:58:36 +08:00
yangxiao 21d581a72c set camera mask when member created 2015-03-18 11:41:43 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00