71a82f0f0d
Correct spelling of function name `getAncestorWidget` ( #17158 )
2017-01-11 05:36:13 -08:00
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
c3bbbb6cb2
Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format ( #16615 )
...
* refactoring ui related code
* fix label bmfont/charmap etc drawing
* make code more robust
2016-09-30 09:42:21 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
aac1558b75
Fix typos in documentation, comments and strings
2015-12-21 08:22:41 +09:00
0b3a342222
Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets
...
Set focus for widgets
2015-11-17 11:24:27 +08:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
2785a4313f
Set focus for widgets
2015-09-30 12:31:33 +03:00
96b49277cc
[ci skip] add comment for UIWidget::_hittedByCamera.
2015-07-01 11:03:09 +08:00
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
a29becb185
[ci skip] Add javascript notes...
...
cocos/ui/UIHBox.h
cocos/ui/UIHelper.h
cocos/ui/UIImageView.h
cocos/ui/UILayout.h
cocos/ui/UIText.h
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.h
cocos/ui/UIVBox.h
cocos/ui/UIVideoPlayer.h
cocos/ui/UIWebView.h
cocos/ui/UIWidget.h
2015-03-30 21:38:32 +08:00
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
ff3777dfd1
[ci skip]Update comments.
2015-03-27 18:26:14 +08:00
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
bc2ffe4e19
remove unneeded js & lua NA and remove deprecated list from navtree
2015-03-27 11:02:04 +08:00
42cd63fe01
fix group error
2015-03-26 15:47:14 +08:00
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
29e9ef7edf
Merge branch 'v3' into modifyWidgetDefaultBehavior
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
dcd544cc66
update ui widget function format
2014-12-24 11:12:14 +08:00
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
f5a242be97
update for widget percent position and size logic
2014-12-22 15:23:26 +08:00
5a73ea9313
reset widget chaned
2014-12-22 15:04:25 +08:00
56e42b0a0a
update for lay out
2014-12-22 11:20:03 +08:00
be929dcde6
update for cocos reader
2014-12-05 19:19:53 +08:00
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
9c3c693a21
refactor Widget flip logic
2014-11-07 11:11:51 +08:00
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
6badfb30e1
add getTitleRenderer interface to UIButton
2014-09-17 10:57:40 +08:00
294271682b
change return const value to value
2014-09-12 14:39:22 +08:00
ed22792a72
fix text only button issue
2014-09-12 13:50:13 +08:00
3f51926c5d
add click event listener to Widget
2014-08-21 10:21:07 +08:00
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
cdb2b9f59f
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:04:00 +08:00
ee4e479ce1
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 16:38:55 +08:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
70ae3bf980
modify widget class comments
2014-07-16 10:12:13 +08:00
dae29e5678
update UI module code comments
2014-07-15 15:56:07 +08:00
52596dc97f
fix Text line wrap issue
2014-07-15 11:46:53 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00
585ccf2c71
issue #5161 , replace all _size to _contentSize
2014-06-20 10:40:16 +08:00
aa5df68b96
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
2014-06-18 15:13:34 +08:00
2cef0cb437
update ccs-res
2014-06-18 11:26:26 +08:00
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
mogemimi