WenhaiLin
|
0ac99002d5
|
Label:disableEffect(LabelEffect::XXXX) support disable all effect.
|
2015-04-17 14:39:52 +08:00 |
Dale Stammen
|
b1c9c34c19
|
added Windows Image Component support for Windows 8.1 Universal App
|
2015-04-15 09:19:38 -07:00 |
akermen
|
2957263c9d
|
=cocos2d namespace added macros
|
2015-04-11 10:45:19 +03:00 |
akermen
|
1d83229956
|
=cocos2d namespace adder for CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES macro
|
2015-04-11 10:32:33 +03:00 |
andyque
|
c8d8a0d220
|
add disableEffect API for ui::Text
|
2015-04-10 14:18:16 +08:00 |
WenhaiLin
|
aaae566b7b
|
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
|
2015-04-02 23:35:56 +08:00 |
minggo
|
332ce1a8f3
|
Merge pull request #11249 from super626/v3
Release note for texturecube skybox and animtion quality
|
2015-04-02 09:39:16 +08:00 |
yangxiao
|
591fff4046
|
release note for texturecube skybox and animtion quality
|
2015-04-01 16:40:40 +08:00 |
minggo
|
c1cd041912
|
Merge pull request #11221 from super626/v3
3d animation quality control
|
2015-03-31 17:23:58 +08:00 |
lvlong
|
4bc44c207d
|
modify config-example.plist
|
2015-03-30 18:07:32 +08:00 |
lvlong
|
cbdfd77400
|
modify some name.
|
2015-03-30 17:46:45 +08:00 |
lvlong
|
5032194e98
|
modify animate 3d quality to bool
|
2015-03-30 15:57:58 +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 |
lvlong
|
6fe9f0d1c8
|
add comments for 3d animation quality!!!
|
2015-03-30 14:05:03 +08:00 |
lvlong
|
ccb5039411
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
cocos/base/CCConfiguration.h
|
2015-03-30 11:50:01 +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 |
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 |
andyque
|
e3fc9b082e
|
Finish the missing comments
|
2015-03-27 20:56:12 +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
|
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 |
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 |
Wenhai Lin
|
8f3bbe3c40
|
[ci skip]Update comments
|
2015-03-27 15:25:44 +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 |
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 |
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 |
Jacky
|
4edf9e76fd
|
update comments.
|
2015-03-27 12:07:19 +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 |
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 |
Wenhai Lin
|
fdffad3956
|
[ci skip]Fixed warnings when generating docs by doxygen.
|
2015-03-27 10:52:59 +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 |
minggo
|
f7e11a2467
|
Merge pull request #11168 from andyque/fix-comments
fix group error
|
2015-03-26 16:10:06 +08:00 |
andyque
|
42cd63fe01
|
fix group error
|
2015-03-26 15:47:14 +08:00 |
minggo
|
1f0ba8cf2b
|
fix some documentation
|
2015-03-26 15:40:54 +08:00 |
lvlong
|
c999307150
|
add different animate quality.
|
2015-03-26 11:30:22 +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 |
minggo
|
fae951d928
|
Merge pull request #11150 from samuele3hu/v3_5_test
[ci skip]Update comments of some header files
|
2015-03-26 10:00:11 +08:00 |
samuele3hu
|
1bea6a52a2
|
Update comments of some header files
|
2015-03-25 18:54:33 +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
|
bed7746459
|
Merge pull request #11120 from fusijie/cocosapi
[ci skip]add comments.
|
2015-03-25 09:49:52 +08:00 |
Huabing.Xu
|
e6d1dcef58
|
Merge pull request #11123 from WenhaiLin/v3-doxygen
V3 doxygen
|
2015-03-24 20:33:17 +08:00 |
WenhaiLin
|
9dd778edb0
|
[ci skip]Update comments
|
2015-03-24 20:23:51 +08:00 |
Jacky
|
32f37b8701
|
[ci skip]add comments.
|
2015-03-24 18:22:52 +08:00 |
VisualSJ
|
6590d34bda
|
[ci skip] Add javascript notes...
cocos/base/CCEventListener.h
cocos/base/CCEventListenerAcceleration.h
cocos/base/CCEventListenerController.h
cocos/base/CCEventListenerCustom.h
cocos/base/CCEventListenerFocus.h
cocos/base/CCEventListenerKeyboard.h
cocos/base/CCEventListenerMouse.h
cocos/base/CCEventListenerTouch.h
cocos/base/CCEventMouse.h
cocos/base/CCEventTouch.h
|
2015-03-24 16:37:09 +08:00 |
WenhaiLin
|
3b555be91a
|
[ci skip]Update comments
|
2015-03-24 15:13:05 +08:00 |
WenhaiLin
|
9e7e819eab
|
[ci skip]Update comments
|
2015-03-24 14:43:54 +08:00 |
WenhaiLin
|
2caff4e64d
|
[ci skip]Update comments
|
2015-03-24 14:12:58 +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 |
minggo
|
4973de2b25
|
add more doxygen document
|
2015-03-24 11:15:40 +08:00 |
minggo
|
9976885d37
|
Merge pull request #11079 from fusijie/cocosapi
add comments.
|
2015-03-24 09:50:19 +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
|
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
|
e86e954abf
|
add doxygen comment for CCVector.h
|
2015-03-23 22:13:04 +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 |
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 |
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
|
4143eae713
|
Merge pull request #11061 from fusijie/cocosapi
add comments.
|
2015-03-23 16:23:51 +08:00 |
Jacky
|
cc09b84153
|
add comments.
|
2015-03-21 18:02:56 +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
|
0648ac7ca0
|
Merge pull request #11004 from SuYaoHui/cocosapi
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
|
2015-03-19 21:47:32 +08:00 |
Jacky
|
85c04ff605
|
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
|
2015-03-19 21:41:40 +08:00 |
dingpinglv
|
3413c716df
|
Issue: Added js annotates to CCScheduler.h
|
2015-03-19 21:25:09 +08:00 |
SuYaohui
|
c295952c71
|
NodeGrid,Config,NS,ApplicationProtocol
|
2015-03-19 21:03:28 +08:00 |
dingpinglv
|
baa723a899
|
Issue : Added js annotates to CCController.h
|
2015-03-19 20:26:44 +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 |
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 |
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 |
minggo
|
7f825d3dae
|
update document for ccUtils.h
|
2015-03-18 21:45:00 +08:00 |
VisualSJ
|
3576df4b89
|
Add javascript notes...
cocos/base/CCDirector.h
|
2015-03-18 21:39:50 +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 |
minggo
|
85811bd710
|
update document for CCUserDefault.h
|
2015-03-18 21:24:31 +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 |
minggo
|
19fc6a1495
|
update document for CCScheduler.h
|
2015-03-18 20:37:43 +08:00 |
minggo
|
0408fc0667
|
update document for CCRef.h
|
2015-03-18 15:02:03 +08:00 |
minggo
|
be2af44583
|
update document for CCDirector.h
|
2015-03-17 22:32:26 +08:00 |
minggo
|
44c04153a6
|
update document for CCDataVisitor.h
|
2015-03-17 20:54:47 +08:00 |
minggo
|
36bf7c6d39
|
update document for CCAutoreleaseData.h
|
2015-03-17 20:49:00 +08:00 |
minggo
|
5b55e873d0
|
update document for CCAutoreleasePool.h
|
2015-03-17 20:15:50 +08:00 |
Vladimir Perminov
|
e745d5949a
|
Create Console before any sub systems
Sub system use cocos2d::log in constructors.
|
2015-03-16 20:22:20 +03:00 |
minggo
|
2ea88a30bb
|
Merge pull request #10817 from garfieldkwong/fix_autorelease_branch
fix issue autorelease will not release trigger by autorelease.
|
2015-03-16 14:47:30 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
GarfieldKwong
|
656842d6f1
|
fix issue autorelease will not release trigger by autorelease.
|
2015-03-11 15:31:06 +08:00 |
mogemimi
|
de4105516a
|
Add const to Value::getDescription() function
|
2015-03-09 22:34:24 +09:00 |
Sergey
|
de284c98ce
|
MinGW build fix
|
2015-03-05 11:11:13 +03:00 |