Petr Babička
fa245c44b9
Spaces instead of tabs
2015-03-16 17:22:17 +01:00
Alok Sahay
80576b5903
Don't set scale and loadHTMLString on nil.
2015-03-16 17:00:01 +01:00
Dale Stammen
ef5e6fc473
fixed use of Color4B
2015-03-16 02:17:05 -07:00
minggo
d0753674b2
Merge pull request #10514 from cpascal/uiEditBox_Win32
...
Fixed missing ui::EditBox functionalities on Win32
2015-03-16 14:56:49 +08:00
minggo
1916bc1f1f
Merge pull request #10693 from Mazyod/editbox-text-alpha-support
...
Support Color4B for editbox text
2015-03-16 14:52:36 +08:00
minggo
ebe5dff7a6
Merge pull request #10737 from newnon/v3_scale9_blend_func
...
blending function for Scale9Sprite
2015-03-16 14:45:08 +08:00
Martin Konopka
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
Mazyad Alabduljaleel
ce377c4a1e
Fix compilation issues on Android and Win
2015-03-06 16:05:05 +04:00
Sergey
8270355ad6
blending function for Scale9Sprite
2015-03-05 11:13:51 +03:00
cpascal
db9985d7cd
Added new line with the left curl bracket.
2015-03-03 20:39:25 +09:00
cpascal
a6ee1451f4
changed one more indentation.
...
I made mistake, (now replacing the spaces to tab)
2015-03-03 13:44:43 +09:00
cpascal
4058e16f16
Added line break & removed function call in compare operator.
2015-03-03 13:40:40 +09:00
Mazyad Alabduljaleel
9d5fdcb973
Support Color4B for editbox text
2015-03-02 15:31:59 +04:00
Mazyad Alabduljaleel
4387844176
Fix editbox on Mac
2015-03-01 23:56:18 +04:00
yangxiao
f13237c013
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-02-26 17:27:42 +08:00
pandamicro
9bf22a51ea
Fix ListView::setDirection issue
2015-02-25 16:17:43 +08:00
cpascal
8d9da362e5
changed indentation.
2015-02-23 11:55:27 +09:00
cpascal
e7a39287f1
Fixed missing ui::EditBox functionalities on Win32
...
1. There was 100-byte input limit at ui::EditBoxImplWin::openKeyboard()
2. Implemented MaxLength as LengthFilter, not ByteFilter. (same as
Android's InputFilter - LengthFilter)
3. Users can input unicode characters that is not supported by CP_ACP.
2015-02-16 18:21:26 +09:00
lvlong
ee03bb8eea
setCameraMask for cocostudio-ui
2015-02-12 09:24:04 +08:00
minggo
8d681dfe7d
Merge pull request #10218 from andyque/fixIssue10183
...
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
2015-01-28 09:57:34 +08:00
minggo
880abfe814
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
...
Fix loading bar reload texture issue
2015-01-27 13:50:38 +08:00
minggo
e1afb7c789
Merge pull request #10226 from andyque/removeDuplicateCode
...
remove unused code
2015-01-27 13:50:15 +08:00
andyque
7b81f3a811
remove unused code
2015-01-27 10:17:41 +08:00
cpascal
d857164768
Added override of ui::EditBox::getDescription()
2015-01-27 11:10:04 +09:00
andyque
95e8072afa
fixed issue #10183
2015-01-26 18:26:59 +08:00
andyque
732050d940
don't release the scale9Image when updateSprites
2015-01-26 16:04:43 +08:00
andyque
0e67cfcbff
improve loading Bar Test
2015-01-26 14:39:44 +08:00
minggo
cba0e19252
Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield
...
Change the order of detach and attach of TextField::upadate
2015-01-26 14:00:58 +08:00
minggo
4ac50f2c26
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
...
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
andyque
fdbf84a118
add uploading switch scale9 tests
2015-01-26 13:49:54 +08:00
Wenhai Lin
81198583f1
Fixed sets the page's base URL for WebView doesn't work.
2015-01-23 18:30:12 +08:00
minggo
516c6f1387
Merge pull request #10187 from joshuastray/fix-win32-editbox-clip
...
Fix win32 editbox content not clipped correctly
2015-01-23 16:16:00 +08:00
Jialong Zhai
b295c8e817
fix indentation
2015-01-23 14:13:36 +08:00
Jialong Zhai
7ef80e9dae
Update UIEditBoxImpl-win32.cpp
2015-01-23 14:11:22 +08:00
andyque
94e35d8d95
fix slider scale9 render
2015-01-22 15:53:33 +08:00
minggo
72fb059aeb
Merge pull request #10144 from andyque/fixButtonPressActionIssue
...
fix button pressAction scale issue
2015-01-21 16:37:59 +08:00
andyque
d58426db99
fix button pressAction scale issue
2015-01-21 14:54:37 +08:00
andyque
7f7506fb99
fix progress bar render issue when switch scale9
2015-01-21 13:41:40 +08:00
minggo
dca1edccd7
Merge pull request #10113 from liamcindy/Scale9Error
...
update for ui object scale9 state refresh
2015-01-21 10:51:55 +08:00
minggo
e8b6705d29
Merge pull request #10071 from liamcindy/Text_2.4
...
fix uitext size error
2015-01-21 09:40:34 +08:00
minggo
eb2ca9eef5
Merge pull request #10069 from liamcindy/Button_2.4
...
add function for ui button
2015-01-21 09:36:35 +08:00
minggo
6870692cfe
Merge pull request #10072 from liamcindy/TextBMFont
...
BMFont need to refresh size by refresh the string
2015-01-21 09:32:54 +08:00
minggo
b61a28633e
Merge pull request #10102 from andyque/addListViewReuseCell
...
Refactoring bad coding style
2015-01-21 09:24:56 +08:00
Liam
902fba0638
fix slider and loadingbar scale9 error
2015-01-20 20:57:54 +08:00
Liam
a72e65b4de
add function for uiText and uiTextField
2015-01-20 18:40:25 +08:00
Liam
a42d213d16
update for ui object scale9 state refresh
2015-01-20 17:24:04 +08:00
andyque
9a43706db8
refactor variable names of ui::Scale9Sprite
2015-01-20 15:29:25 +08:00
minggo
7dee9d2356
Merge pull request #10074 from liamcindy/LayoutComponent_2.4
...
update for lay out component
2015-01-20 15:12:49 +08:00
andyque
38906dce45
refactor for scale9Sprite
2015-01-20 15:10:03 +08:00
andyque
1fb30c61f7
clean up coding style
2015-01-20 14:24:10 +08:00
andyque
221e7a4310
refactor remedyLayoutParamter function
2015-01-20 14:24:10 +08:00
Liam
81f3995cc1
update uiTextBMFont setString
2015-01-20 14:20:20 +08:00
Liam
118b74e95c
update uiTextBMFont setFontFile
2015-01-20 13:55:39 +08:00
minggo
a3046730d7
Merge pull request #10073 from liamcindy/Widget_2.4
...
the ui widget need to refresh size by ignore state
2015-01-20 11:23:23 +08:00
Liam
3b0ba72b01
update for lay out component
2015-01-19 17:11:04 +08:00
Liam
62020483fc
the ui widget need to refresh size by ignore state
2015-01-19 17:09:15 +08:00
Liam
d38b802780
BMFont need to refresh size by refresh the string
2015-01-19 17:07:15 +08:00
Liam
e8fa6597df
fix uitext size error
2015-01-19 17:02:28 +08:00
Liam
987bfd4831
fix imageview render error
2015-01-19 17:00:53 +08:00
Liam
90df276067
add function for ui button
2015-01-19 16:58:46 +08:00
andyque
3f99f3d454
fix crash when navigation controller is null
2015-01-15 15:18:14 +08:00
Jialong Zhai
6f99e161f8
Change the order of detach and attach of TextField::upadate
2015-01-12 10:18:55 +08:00
andyque
0f49bb977d
improve ui::Text and ui::TextField creation performance
2015-01-07 17:21:41 +08:00
minggo
7ab4e0de3a
Merge pull request #9634 from andyque/fixIssue9628
...
fix setTitleColor calls method setColor instead of setTextColor of title label.
2014-12-29 11:24:36 +08:00
minggo
491d36c62b
Merge pull request #9626 from liamcindy/CocoReader
...
update for cocos reader
2014-12-26 09:29:37 +08:00
andyque
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
andyque
3f0f7c289f
change setColor to setTextColor
2014-12-25 16:07:34 +08:00
Liam
fa85faec68
update for cocos reader
2014-12-25 15:02:22 +08:00
minggo
bb9fb9f0d6
Merge pull request #9591 from liamcindy/Layout
...
update for lay out
2014-12-24 14:27:08 +08:00
Liam
dcd544cc66
update ui widget function format
2014-12-24 11:12:14 +08:00
Liam
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
Liam
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
minggo
ca932a38e4
Merge pull request #9538 from andyque/fixCapInsetSize
...
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-23 14:44:32 +08:00
minggo
90a7f99873
Merge pull request #9570 from liamcindy/UIListView
...
override function for listview
2014-12-23 14:25:46 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
Liam
377d8ec3c0
Merge branch 'UILayout' into UILayout_Widget
2014-12-22 19:22:09 +08:00
Liam
39d0f183d4
update for code format
2014-12-22 19:05:31 +08:00
Liam
0465ff8325
remote unuseful format
2014-12-22 18:39:44 +08:00
Liam
f5a242be97
update for widget percent position and size logic
2014-12-22 15:23:26 +08:00
Liam
5a73ea9313
reset widget chaned
2014-12-22 15:04:25 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
Liam
7c4d31feab
update for lay out samples
2014-12-22 14:51:50 +08:00
Liam
56e42b0a0a
update for lay out
2014-12-22 11:20:03 +08:00
Liam
8d8215b148
override function for listview
2014-12-22 09:55:29 +08:00
joewanchen
c2473b9b99
fix.
2014-12-21 01:03:30 +08:00
andyque
b11e3d74cc
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
2014-12-17 16:46:48 +08:00
minggo
d9953d4aac
Merge pull request #9519 from andyque/addNewRequirements
...
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-17 09:53:31 +08:00
minggo
116ff0de63
Merge pull request #9439 from andyque/addcreateMethodToLoadingBar
...
add TextureResType to LoadingBar's create method
2014-12-16 18:31:20 +08:00
andyque
16cf396ed7
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-16 16:44:04 +08:00
Edward Zhou
1ca92411fc
Fix UIText miss copy contentSize for clone
2014-12-11 13:33:28 +08:00
minggo
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
andyque
989c05cd2d
add TextureResType to LoadingBar
2014-12-10 10:21:17 +08:00
andyque
d53d71610b
Merge branch 'v3' into fixEditBox_v3
2014-12-08 15:20:06 +08:00
yusheng.lu
2f456a5668
ListViewReader completed and listview callback feature.
2014-12-05 19:31:10 +08:00
Liam
be929dcde6
update for cocos reader
2014-12-05 19:19:53 +08:00
pipu
915449f77a
Modify UICheckBox
2014-12-02 12:23:15 +08:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
andyque
1bb60ab4bb
add null pointer check, make code more robust
2014-11-27 18:25:13 +08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
andyque
e118b085b8
add UIText bug fix tests
2014-11-26 15:05:20 +08:00
andyque
a2883aa097
fix UIText dimension error when set ignoreContentSize to false
2014-11-26 13:41:24 +08:00
Haneol Park
a6e4b31b0d
Additional unnecessary set dirty of ui widgets
2014-11-25 20:42:03 +09:00
Haneol Park
d25fdca4af
Unnecessary set dirty of ui widget
2014-11-25 17:50:46 +09:00
minggo
74e7aa6db9
Merge pull request #9205 from Dhilan007/v3-scriptfix
...
replace tab with four spaces
2014-11-24 15:22:00 +08:00
minggo
b8bb61c7c6
Merge pull request #9028 from andyque/fixWidgetFlipIssue
...
Fix widget flip issue
2014-11-24 15:19:50 +08:00
Dhilan007
4e769d40b1
replace tab with four spaces
2014-11-24 11:26:34 +08:00
minggo
87f70cfaec
Merge pull request #9113 from Dhilan007/v3-scriptfix
...
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
2014-11-24 10:09:19 +08:00
Vladimir Timofeev
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
Dhilan007
ac0fb68989
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
2014-11-14 15:04:32 +08:00
Vladimir Timofeev
dba8ef33bd
cmake: connect mac specific UIEditBox implementation to build
2014-11-11 10:30:48 +03:00
Xavier Arias Botargues
dd25ff7a39
Fixed retina/contentScale position errors for iPhone 6+ devices in EditBox.
...
Problem is that factor was 1.0 or 2.0 until iOS 8 introduced 3.0.
2014-11-07 12:08:31 +01:00
andyque
9c3c693a21
refactor Widget flip logic
2014-11-07 11:11:51 +08:00
andyque
5483bc834d
fix scale9sprite flip issue
2014-11-07 11:09:22 +08:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
minggo
87d7b7e8ee
Merge pull request #8973 from joshuastray/fix_constructor_access
...
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-31 10:26:32 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
Jialong Zhai
ce85ea3946
fix indentation
2014-10-30 14:38:55 +08:00
Jialong Zhai
4113929fc0
Update UIVideoPlayer.h
2014-10-30 14:36:15 +08:00
Jialong Zhai
fd238cab36
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-30 14:24:37 +08:00
Liam
19ed3d1965
udpate for ui button state change event
2014-10-27 11:16:25 +08:00
Liam
57e6631918
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-10-25 19:01:18 +08:00
Liam
f1970e98dd
update for ui button press event
2014-10-25 18:00:57 +08:00
Liam
92bdfea638
update ui button size changed logic
2014-10-24 17:38:32 +08:00
Dale Stammen
6fcd0ebafd
don't hide flyout when keyboard is hidden
2014-10-23 22:23:42 -07:00
Dale Stammen
5df4278e36
fixed reentrancy when closing flyout
2014-10-23 22:17:25 -07:00
Dale Stammen
b77e7a5a97
fixed reentrancy when closing flyout
2014-10-23 22:01:35 -07:00
Dale Stammen
afa052c5c7
added critical section
2014-10-23 20:49:10 -07:00
Dale Stammen
6e92d169cd
changed implementation to use xaml flyout for editbox
2014-10-23 19:30:32 -07:00
Dale Stammen
d2f852c3cb
added editbox support for universal apps
2014-10-23 07:39:38 -07:00
Dale Stammen
9b2adef6b2
added CC_PLATFORM_WINRT
2014-10-23 07:15:58 -07:00
minggo
db8dc25b01
fix warning
2014-10-21 11:40:34 +08:00
minggo
bca15538e3
Merge pull request #8823 from super626/v3
...
add isVisibleByVisitingCamera check
2014-10-18 15:11:45 +08:00
samuele3hu
529ee72432
Fix compile error triggered by UIHelper.cpp
2014-10-18 00:25:55 +08:00
Liam
3089317eb7
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3
2014-10-17 19:18:12 +08:00
Liam
3f954857a8
update for lay out
2014-10-17 19:13:37 +08:00
yangxiao
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
yangxiao
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
minggo
31664d979a
Merge pull request #8783 from andyque/adjustUITestProject
...
fix scrollView rotate issue
2014-10-17 14:54:32 +08:00
minggo
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +08:00
andyque
952e52365b
fix scrollView rotate issue
2014-10-17 14:02:49 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
Dhilan007
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
Dale Stammen
8700c0b07e
added check for WinRT and WP8
2014-10-14 14:22:19 -07:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
minggo
1d5652ad48
Merge pull request #8635 from ahlwong/v3
...
Fix UIButton setFontSize sync ContentSize
2014-10-13 17:25:18 +08:00
pipu
96c8fde63a
1. Modifying UIButton.cpp
...
2. Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
2014-10-13 12:49:15 +08:00
pipu
8040955062
Modifying cocos/editor-support/cocostudio/CMakeLists.txt, cocos/ui/CMakeLists.txt
2014-10-12 20:21:32 +08:00
pipu
2d51724686
1. Update wp8 projects.
2014-10-12 19:32:13 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
minggo
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
pipu
ab969db441
Modifying ImageViewReader, UIImageView
2014-10-11 15:43:37 +08:00
pipu
29eb552d00
1. Modifying ButtonReader
...
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
2014-10-11 15:35:09 +08:00
Ahlwong
dd5c5a29b9
Refactor UIButton ContentSize update
2014-10-10 21:13:04 -07:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
Ahlwong
d95b1cef7a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Update from upstream.
2014-10-10 19:10:44 -07:00
Ahlwong
4aceaee08c
Fix UIButton setFontSize sync ContentSize
2014-10-10 11:17:43 -07:00
pipu
ffd83bbdd0
Modifying win32 and wp8 protocol buffers lib
2014-10-10 22:38:34 +08:00
minggo
4a193c6d76
Merge pull request #8554 from newnon/v3_scale9sprite_capinets_fix
...
Scale9Sprite capInsets set fix
2014-10-10 18:05:32 +08:00
Dhilan007
89db9ecd3b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
...
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
minggo
63e4d7ce27
Merge pull request #8614 from andyque/fixEditBoxMaxLengthOnMac
...
fix setMaxLength issue of EditBox-mac
2014-10-10 16:28:21 +08:00
andyque
2013cdb4ef
fix setMaxLength issue of EditBox-mac
2014-10-10 15:26:33 +08:00
andyque
da48649370
fix button title only content size issue
2014-10-10 11:01:51 +08:00
pipu
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
Ahlwong
5027f24348
Fix UIButton Scale 9 Highlight
2014-10-09 12:48:09 -07:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
martell
1a7ecbe427
Finalise Mac Support for cmake
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:19 +01:00
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
martell
c7f3594a1b
added support for static and shared builds with ui
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:38 +01:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Sergey
d9b0039517
Scale9Sprite capInsets set fix
2014-10-03 17:38:02 +04:00
Sergey Perepelitsa
d9204b009e
scale9Sprite without scale9enabled scale fix
...
scale9Sprite crop > border tile bug fix
2014-09-30 10:59:20 +04:00
Sergey Perepelitsa
c1f37a6926
Misprint fix
...
scale9Image double draw fix
2014-09-28 10:30:33 +04:00
Sergey Perepelitsa
ab45c582a7
Scale9Sprite improvements
...
small bugs fix
small optimizations
support for cropped sprite frames
2014-09-28 01:58:26 +04:00
andyque
3c434ec354
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
2014-09-24 17:47:38 +08:00
andyque
53d28168fe
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
2014-09-24 16:39:32 +08:00
Sergey Perepelitsa
0a46a83794
fix missing includes
2014-09-23 23:19:25 +04:00
Jeff
2ffbe23c50
The files name: modify underline to hyphen
2014-09-19 10:24:17 +08:00
Jeff
6152b70945
LE
2014-09-18 16:33:46 +08:00
Jeff
0ee4ee03c1
CE
2014-09-18 16:00:18 +08:00
Jeff
418ec69abf
compile error
2014-09-18 15:18:30 +08:00
Jeff
ac6b83f8f9
fix compile error
2014-09-18 14:22:40 +08:00
Jeff
c5cc16336a
fix compile error
2014-09-18 14:04:54 +08:00
Jeff
b9ec99d7f4
compile error & code spelling error
...
1.fix compile error on win32
2.modify spelling error
2014-09-18 11:52:23 +08:00
Jeff
ed530454b2
fix compile error
2014-09-18 02:11:20 +08:00
Jeff
e9c6f5d02b
fix compile errors
2014-09-18 01:30:14 +08:00
Jeff
08e8963b1a
fix compile errors
2014-09-18 00:04:48 +08:00
Jeff
27919dad77
add simple implement of WebView for win32
...
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
2014-09-17 22:30:15 +08:00
minggo
ccbf694927
Merge pull request #8086 from huangshiwu/v3_test
...
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
2014-09-17 14:50:42 +08:00
huangshiwu
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
andyque
6badfb30e1
add getTitleRenderer interface to UIButton
2014-09-17 10:57:40 +08:00
andyque
af3dd215cb
improve android web view
2014-09-15 18:14:04 +08:00
andyque
5f95ad221e
improve iOS WebView
2014-09-15 18:02:11 +08:00
andyque
126ec18a89
add video player debug draw config
2014-09-15 17:59:51 +08:00
andyque
71b6be678e
fix header guard
2014-09-15 16:56:51 +08:00
andyque
030fe34afa
fix UI related warnings
2014-09-15 11:13:56 +08:00
andyque
7b0f41ed7b
remove auto scale text
2014-09-15 09:28:56 +08:00
andyque
880929f102
fix button scale issue
2014-09-13 22:08:02 +08:00
minggo
55783b66c2
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
...
V3 drawnode prbk
2014-09-12 15:17:49 +08:00
andyque
294271682b
change return const value to value
2014-09-12 14:39:22 +08:00
andyque
c81cfc1ecf
fix text doesn't scale with button issue
2014-09-12 14:24:27 +08:00
andyque
ed22792a72
fix text only button issue
2014-09-12 13:50:13 +08:00
huangshiwu
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
huangshiwu
8d8f4436db
Deprecate DrawPrimitives and enhance DrawNode --fix android compile error
2014-09-11 17:55:47 +08:00
huangshiwu
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
andyque
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
huangshiwu
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
Ricardo Quesada
d5a6289a9b
compiles on wp8
2014-09-09 18:22:11 -07:00
Ricardo Quesada
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
andyque
83e14259ad
deprecated ui::TextField getStringValue and setText, use getString and
...
setString instead
2014-09-09 13:59:35 +08:00
Sergey
14853d46f2
setPlaceholderFontSize fix
2014-09-03 23:38:44 +04:00
andyque
51e160beff
fix EditBox lua compile error
2014-09-02 17:37:55 +08:00
andyque
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
andyque
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
andyque
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
andyque
043acb2fd4
rename webview to UIWebView
2014-08-29 11:28:28 +08:00
andyque
cd031c4493
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
Dhilan007
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
andyque
3d97ddc739
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
minggo
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
andyque
4597de069d
improve test case and make program more robust
2014-08-27 08:02:22 +08:00
andyque
fc3a30b9ca
modify cmakeList.txt
2014-08-26 23:25:07 +08:00
andyque
9449152caf
finish WebView Tests
2014-08-26 22:03:55 +08:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
andyque
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
andyque
631e1a70c4
add WebView-inl.h and refactor Android code
2014-08-26 14:26:37 +08:00
andyque
e12db46866
fix style
2014-08-26 12:08:26 +08:00
andyque
2226d4b420
change WebView namespace and add WebViewTest
2014-08-26 11:39:56 +08:00
andyque
736b83acb1
Merge branch 'add_webview' of https://github.com/gin0606/cocos2d-x into addWebView
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-26 10:56:10 +08:00
gin0606
41011824c1
Add WebView to libui Android
2014-08-25 15:01:37 +09:00
gin0606
de429591c3
Add WebView to libui iOS
2014-08-25 14:47:42 +09:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
samuele3hu
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
samuele3hu
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
minggo
aba973b1ea
Merge pull request #7834 from andyque/improveUI
...
add click event listener to all Widget classes
2014-08-22 14:00:10 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
minggo
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
andyque
84cf0ee834
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 11:49:39 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
andyque
3f51926c5d
add click event listener to Widget
2014-08-21 10:21:07 +08:00
andyque
34b3f1f0e3
remove warnings
2014-08-21 09:36:12 +08:00
andyque
46f3ab9b57
add Scale9Sprite to create method of ui::EditBox
2014-08-20 16:08:28 +08:00
minggo
41905cb4c0
Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue
...
fix pageView touch location
2014-08-20 10:11:59 +08:00
andyque
07eb0d373c
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
cocos/ui/Android.mk
2014-08-20 09:32:29 +08:00
andyque
a8ab1a85b7
fix linux compile error
2014-08-19 17:42:17 +08:00
minggo
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
andyque
deb7ff64d4
fix pageView touch location
2014-08-19 15:14:07 +08:00
andyque
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
andyque
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
andyque
cf8e40f8ce
deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead
2014-08-15 15:26:19 +08:00
minggo
8364e179a4
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
...
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
andyque
e8a5147b92
copy new added widget property to clone method
2014-08-14 16:56:15 +08:00
andyque
e27a2aee91
fix typo
2014-08-14 14:36:30 +08:00
yangxiao
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
andyque
18851d3e81
add customization to UIButton and UIPageView
2014-08-14 11:14:24 +08:00
yangxiao
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
yangxiao
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
minggo
0b86e129b0
Merge pull request #7762 from andyque/addAlignmentToUILabel
...
add UITextField color & place hold color, fix double delete bug
2014-08-14 09:38:57 +08:00
andyque
3ee6a9ab10
add missing safe guard in checkbox callback
2014-08-13 17:15:15 +08:00
yangxiao
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
andyque
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
andyque
3e1f7119f9
add virtual destructor
2014-08-11 15:54:40 +08:00
andyque
cdb2b9f59f
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:04:00 +08:00
minggo
437257e7e6
Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity
...
Let Widget class don't support cascaded opacity and cascaded color on default.
2014-08-11 09:37:51 +08:00
minggo
c5851f988b
fix conflict
2014-08-08 14:04:38 +08:00
andyque
d00e3349a3
fixed loadingBar change direction affect position issue
2014-08-08 11:17:17 +08:00
samuele3hu
cf0aa36c15
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
samuele3hu
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
andyque
ab33e6f9a2
Let Widget class don't support cascaded opacity and cascaded color on default.
2014-08-06 16:21:00 +08:00
minggo
e43b05955f
Merge pull request #7674 from darkdukey/patch-12
...
Fix opacity for Slider
2014-08-06 09:50:47 +08:00
minggo
16653bf24e
Merge pull request #7675 from darkdukey/chore/reuse-file-utils-for-video-path
...
Chore/reuse file utils for video path
2014-08-06 09:41:28 +08:00
Nite Luo
0a2afe983c
Fix spacing
2014-08-05 17:56:55 -07:00
Nite Luo
9f34a5c0f2
Fix build for ios
2014-08-05 17:53:15 -07:00
Nite Luo
ac20f51f7b
Fix formatting
2014-08-05 16:53:00 -07:00
Nite Luo
e0855d64df
Merge branch 'v3' into patch-12
...
Conflicts:
cocos/ui/UISlider.cpp
2014-08-05 16:51:02 -07:00
David Partouche
118d4d39f0
Fixed the video player not showing on iOS if it's not in FullScreen mode
2014-08-05 16:07:28 +02:00
minggo
6d09b00e1d
Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback
...
fix potential crash when user remove self in widgets callback
2014-08-05 09:46:00 +08:00
minggo
34a0603a52
Merge pull request #7658 from andyque/fixButtonOpacityIssue
...
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
2014-08-05 09:39:13 +08:00
minggo
007e42faa0
Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak
...
Fix iOS VideoPlayer memory leak.
2014-08-05 09:30:52 +08:00
andyque
f44906d56c
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
2014-08-05 08:11:37 +08:00
andyque
d7b17c598d
fix potential crash when user remove self in widgets callback
2014-08-01 20:58:42 +08:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
minggo
0b6254d095
Merge pull request #7587 from dzl-ian/fixTextWidgetColor
...
Add getter and setter for TextColor to Text Widget
2014-08-01 11:57:10 +08:00
zhangbin
d224c77bd4
Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.
2014-07-31 17:51:06 +08:00
minggo
d44a359a1f
Merge pull request #7635 from samuele3hu/v3_new_module
...
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 17:39:01 +08:00
minggo
2851bd9193
Merge pull request #7627 from andyque/fixScale9Sprite
...
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
2014-07-31 16:58:56 +08:00
samuele3hu
ee4e479ce1
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 16:38:55 +08:00
minggo
a77b8e7320
Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
...
add utf8 support for TextField widget
2014-07-31 13:41:57 +08:00
andyque
1de2b78d61
refactor, optimize Scale9Sprite
2014-07-31 11:07:20 +08:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
andyque
03368d42f2
refactor, improve imageView stability
2014-07-30 17:29:22 +08:00
andyque
e6b85fbd77
fix minor bugs of UISlider and remove unused header include in ListView
2014-07-30 16:55:16 +08:00
Huabing.Xu
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
andyque
83298171d9
refactor Layout
2014-07-30 16:33:37 +08:00
andyque
7bcb31f225
refactor loadingBar
2014-07-30 16:08:29 +08:00
andyque
c5d2585049
refactor Slider control
2014-07-30 15:52:27 +08:00
andyque
6492167974
refactor ImageView
2014-07-30 15:27:18 +08:00
andyque
a6e376f93c
refactor UIButton
2014-07-30 15:19:39 +08:00
andyque
f2b0528cc9
refactor
2014-07-30 10:45:35 +08:00
andyque
e7da7b3e42
change unsigned long to size_type
2014-07-30 10:34:37 +08:00
andyque
7abea5dc58
add utf8 support for UITextField
2014-07-30 10:34:37 +08:00
andyque
955da5d3cc
move utf8_substr to ui::helper class.
2014-07-30 10:34:37 +08:00
andyque
4a40604955
refactor getScale9Enabled to isScale9Enabled
2014-07-30 10:31:40 +08:00
andyque
5a22636441
fix windows compile error
2014-07-29 17:51:34 +08:00
gin0606
ef4852b7ec
Fix iOS VideoPlayer memory leak.
2014-07-29 17:56:03 +09:00
andyque
c5ca0dbf10
fix android and linux compile error
2014-07-29 16:24:27 +08:00
andyque
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
andyque
ebf05d1acc
add UIScale9Sprite tests
2014-07-29 16:24:27 +08:00
andyque
717f20571b
add UIScale9Sprite implementation
2014-07-29 16:24:27 +08:00
andyque
32ed796657
add UIScale9Sprite
2014-07-29 16:24:27 +08:00
dzl-ian
b8248a165b
Correct some typos/mistakes in declarations
2014-07-29 13:47:21 +09:00
Huabing.Xu
aaa65dcae4
Merge branch 'v3' into v3_windowChangeModule
2014-07-29 10:20:23 +08:00
Huabing.Xu
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
Unai Orbe
406a718a4c
reuse file utils when resolving video path (ios)
2014-07-28 15:24:17 +01:00
Huabing.Xu
d6bc2f4998
liuGUI->libui for windows
2014-07-28 22:12:07 +08:00
Huabing.Xu
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
minggo
b2e705acd8
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
...
fix remove self in Widget touch callback issue
2014-07-28 14:04:20 +08:00
minggo
a8bb2462de
Merge pull request #7052 from gin0606/videoPlayerScaleIssue
...
Fix video scale issue in iOS
2014-07-28 10:43:13 +08:00
minggo
b58569151b
Merge pull request #7590 from andyque/fixWidgetContentSize
...
Simplify Widget ContentSize cascade change algorithm
2014-07-28 10:40:05 +08:00
Huabing.Xu
7f5782c207
chang module name for windows project file
2014-07-28 09:20:02 +08:00
dzl-ian
bc30519812
Add missing space in function definition
2014-07-27 08:23:16 +09:00
gin0606
c66ebbf528
Fix void* casting
2014-07-25 16:41:12 +09:00
andyque
7353f8685a
Simplify Widget ContentSize cascade change algorithm
2014-07-25 14:59:58 +08:00
dzl-ian
7048bc515b
Remove update of content size as it won't change
2014-07-25 15:52:35 +09:00
Dhilan007
b9cfa4a8b5
fix warn
2014-07-25 14:38:02 +08:00
andyque
3502cb0a23
fix remove self in Widget touch callback issue
2014-07-25 14:23:04 +08:00
dzl-ian
3ad0d981c4
Add getter and setter for TextColor to Text Widget
2014-07-25 14:46:25 +09:00
gin0606
4ee13994ce
Fix Scale issue on cocos2d-x cpp-test
2014-07-25 13:10:16 +09:00
minggo
d3e30b1b32
Merge pull request #7574 from andyque/fixRichTextVisitIssue
...
fix RichText visit issue
2014-07-25 09:24:58 +08:00
Huabing.Xu
c7bfc934fd
windows works now
2014-07-24 12:57:39 +08:00
andyque
a9a16b3ee5
fix RichText visit issue
2014-07-24 11:51:47 +08:00
Huabing.Xu
918da16639
Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError
2014-07-24 10:09:59 +08:00
Huabing.Xu
61ff03ab45
windows cpp-tests works now
2014-07-23 18:34:49 +08:00
andyque
21f1624462
minor fix of RichText
2014-07-23 14:10:00 +08:00
zhangcheng
76c12e9029
1. add export to function CocosGUIVersion()
2014-07-22 10:02:00 +08:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
minggo
45fa2363e8
Merge pull request #7517 from dabingnn/v3_dll
...
V3 dll
2014-07-21 11:53:36 +08:00
andyque
4fa1af584c
fix listview insert child at index bug
2014-07-18 18:02:46 +08:00
Huabing.Xu
8afd7614d1
Merge branch 'v3' into v3_dll
2014-07-18 14:01:17 +08:00
andyque
76ffb2261d
fix ios comiple error
2014-07-17 21:44:33 +08:00
minggo
61597e0e5a
Merge pull request #7496 from Dhilan007/v3-320final
...
Fixed VideoPlayer can't quitting the full screen mode by press the back key on Android.
2014-07-17 21:19:56 +08:00
Dhilan007
51aba5dae4
fixed magic number.
2014-07-17 21:19:09 +08:00
Dhilan007
229b30ed8b
Fixed VideoPlayer can't quitting the full screen mode by press the back key.
2014-07-17 21:10:26 +08:00
andyque
7ff78c61ba
fix richText UTF8
2014-07-17 18:36:09 +08:00
Huabing.Xu
52ac47aea8
Merge branch 'v3' into v3_dll
2014-07-17 18:27:36 +08:00
minggo
578af01ef1
Merge pull request #7499 from andyque/fixRichTextUTF8
...
fix richText utf8 error
2014-07-17 17:57:41 +08:00
andyque
fc2ab110cc
fix richText utf8 error
2014-07-17 17:58:40 +08:00
Dhilan007
8ac1398037
fixed text line wrap issue in UITextField.
2014-07-17 16:23:38 +08:00
Huabing.Xu
3c6e87d34e
Merge branch 'v3' into v3_dll
...
Conflicts:
cocos/base/ccUtils.h
2014-07-17 14:12:10 +08:00
minggo
c0fdc747e8
Merge pull request #7460 from andyque/fixComments
...
modify widget class comments
2014-07-17 10:00:12 +08:00
andyque
46aafeecc6
remove unused functions
2014-07-16 16:28:01 +08:00
Huabing.Xu
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
andyque
70ae3bf980
modify widget class comments
2014-07-16 10:12:13 +08:00
andyque
dae29e5678
update UI module code comments
2014-07-15 15:56:07 +08:00
andyque
1dc1df0827
fix Layout typo
2014-07-15 14:57:10 +08:00
Huabing.Xu
dbd3fce0a5
windows dll version of cpp-tests works
2014-07-15 13:54:08 +08:00
andyque
52596dc97f
fix Text line wrap issue
2014-07-15 11:46:53 +08:00
kyokomi
915bdae4a6
Fix the bug that UITextField doesn't support TTF font
2014-07-12 22:42:44 +09:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
minggo
4f42df3cea
Merge pull request #7336 from andyque/addMoreUITests
...
fix opacity issue when replace Widget textures
2014-07-08 20:15:21 +08:00
andyque
2a2184331e
fix opacity issue when replace Widget textures
2014-07-08 11:30:27 +08:00
minggo
b0d260d293
Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9
...
Fix UITextField IME can't auto detach
2014-07-08 10:56:16 +08:00
andyque
841efea783
fix ui::Helper::seekWigetByName can not find pages in pageview
2014-07-05 12:53:56 +08:00
minggo
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
Pisces000221
1596848979
Also cascade the colours
2014-07-03 14:08:00 +08:00
minggo
6cc600ccce
fix compiling warnings
2014-07-03 11:43:56 +08:00
Pisces000221
1cf2910f73
Cascade slide ball's opacity and the Slider's
2014-07-02 18:27:01 +08:00
zhangcheng
d1db470cf2
Merge branch 'macLoader' into v3_OpBinaryParse
2014-07-02 16:11:02 +08:00
andyque
6e64714331
fix scroll
2014-07-02 11:48:28 +08:00
minggo
e15d563219
Merge pull request #7247 from andyque/fixFocus
...
fix focus functions
2014-07-01 16:02:23 +08:00
andyque
b9a968680f
add default value to widgets reader
2014-07-01 10:57:12 +08:00
andyque
4e63a3da7d
modify nodeReader to support LabelAtlas and LabelBMFont
2014-07-01 10:11:36 +08:00
andyque
60ea37cabc
fix focus functions
2014-06-30 14:09:27 +08:00
joshuastray
99b127ba5d
fix scrollview crashes on win32 because of variable returned without initialization
2014-06-30 10:19:00 +08:00
andyque
94e311bebb
fix platform compile error
2014-06-27 16:11:35 +08:00
andyque
1eab15ea41
add MarginZero as an external variable
2014-06-27 15:56:29 +08:00
andyque
62e046c0d5
add deprecated variable
2014-06-27 15:42:00 +08:00
andyque
bd663ac55e
fix margin zero
2014-06-27 15:39:10 +08:00
andyque
d06ca0e75d
fix gui reader
2014-06-26 17:29:07 +08:00
andyque
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
minggo
e90e7699a6
Merge pull request #7195 from minggo/addChild-override
...
override addChild by name
2014-06-25 14:12:10 +08:00
minggo
728fab706e
Merge pull request #7194 from andyque/fixTouchEvent
...
fix touch related issue
2014-06-25 14:05:16 +08:00
andyque
6df8079fd7
closed #5591 , fix UIButton setTitleColor & getTitleColor not match
2014-06-25 13:47:29 +08:00
minggo
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
andyque
78e119ef56
Merge branch 'v3' into fixTouchEvent
...
Conflicts:
cocos/ui/UIWidget.cpp
2014-06-25 11:10:51 +08:00
andyque
693ec0be29
fix listView Item move respond to click event
2014-06-25 10:50:18 +08:00
andyque
65e4c6f4d5
fix listView item click move
2014-06-25 10:45:08 +08:00
andyque
547ad379ae
closed #5589
2014-06-24 15:51:14 +08:00
andyque
4d82673760
issue #5161 , replace _size with _contentSize
2014-06-24 15:08:58 +08:00
andyque
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
andyque
7eae7625c1
Merge branch 'v3' into cleanupBinaryLoader
2014-06-23 18:30:03 +08:00
andyque
808c4bd763
remove unused override method
2014-06-23 15:46:07 +08:00
andyque
c9bcbfb265
fix addEventListener hidden problem
2014-06-23 12:09:49 +08:00
andyque
5624da5448
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
2014-06-23 09:37:39 +08:00
andyque
9b945683b5
fix contentSize not set properly problem
2014-06-20 14:55:42 +08:00
andyque
5f5b705bee
refactor setSize to setContentSize and deprecated the old interface
2014-06-20 14:03:33 +08:00
andyque
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00
zhangbin
ec62f05b12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-20 10:51:13 +08:00
zhangbin
0019d9a061
Optimize the win32 projects configuration.
2014-06-20 10:50:43 +08:00
andyque
585ccf2c71
issue #5161 , replace all _size to _contentSize
2014-06-20 10:40:16 +08:00
gin0606
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
gin0606
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
andyque
aa5df68b96
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
2014-06-18 15:13:34 +08:00
minggo
08453b911d
Merge pull request #7071 from pandamicro/Script_onEnter_fix
...
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-18 13:37:57 +08:00
pandamicro
94fdff1da9
Fixed #5563 : Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
2014-06-18 11:51:52 +08:00
minggo
6ecca08340
Merge pull request #7039 from minggo/get-child-by-name
...
issue #4693 : add getName(), setName() and getChildByName()
2014-06-18 11:30:14 +08:00
andyque
2cef0cb437
update ccs-res
2014-06-18 11:26:26 +08:00
minggo
f05eb9532d
fix compiling error
2014-06-18 11:11:08 +08:00
kyokomi
3f7cecaf8b
fix move this enum class to private part and change `Type` to `FontType`.
2014-06-17 16:34:54 +09:00
pandamicro
d00c9fe70a
Fixed #5563 : Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
2014-06-16 12:50:35 +08:00
andyque
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
kyokomi
7d710f6aed
Fix UIButton.cpp added TTFFont.
2014-06-15 16:58:05 +09:00
pandamicro
d524ba1013
Fixed #5563 : Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-13 17:59:23 +08:00
gin0606
afbed7ee32
Fix video scale issue in iOS
2014-06-12 20:19:41 +09:00
minggo
8a5bfb9840
issue #4693 : add getName(), setName() and getChildByName()
2014-06-11 16:57:43 +08:00
andyque
7a8f27ee0b
remove unused parser code
2014-06-11 14:15:34 +08:00
Frank.Xu
11919413c8
Fix UITextField IME can't auto detach
2014-06-10 14:53:27 +08:00
samuele3hu
5a80b4da2e
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
2014-06-10 11:30:39 +08:00
minggo
8a3e64918d
Merge pull request #7014 from andyque/ImproveUIText
...
improve UIText
2014-06-09 15:27:04 +08:00
andyque
d46025af64
Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField
...
Conflicts:
cocos/ui/UITextField.h
2014-06-09 14:46:04 +08:00
andyque
b7c8759f3b
modify outline size parameter
2014-06-09 14:37:56 +08:00
andyque
a52532c3c5
Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText
...
Conflicts:
cocos/ui/UIText.cpp
2014-06-09 14:17:57 +08:00
andyque
6bc82ef5ab
restore UIScrollView constructor and destructor to public
2014-06-09 10:47:02 +08:00
andyque
c4f5e71bbd
restore Widget's constructor and destructor to public
2014-06-09 10:41:17 +08:00
andyque
1a933807b5
remove UIInterface.h header file
2014-06-09 10:35:54 +08:00
andyque
7a25fbfe29
refactor touch event
2014-06-09 10:23:11 +08:00
Frank.Xu
d7f808934d
Add const for getStringLength() function
2014-06-06 17:06:55 +08:00
zhouxiaoxiaoxujian
e0cc5153fa
Remove misleading comment, add new comment
...
Remove misleading comment, add new comment for enableOutline
2014-06-06 16:54:51 +08:00
zhouxiaoxiaoxujian
fabc4d03ee
Update UIText.cpp
2014-06-06 16:50:25 +08:00
zhouxiaoxiaoxujian
03eeb2cade
Remove unnecessary Type::TTF Check
...
Remove unnecessary TTF type check on enableOutline or enableGlow function。
2014-06-06 16:41:45 +08:00
andyque
4f22b03d7f
refactor Widget setColor & setOpacity
2014-06-06 16:14:35 +08:00
andyque
282264575b
refactor TextField setColor & setOpacity
2014-06-06 16:10:33 +08:00
andyque
5ae97da030
refactor TextBMFont setColor & setOpacity
2014-06-06 16:09:59 +08:00
andyque
d615de8299
refactor TextAtlas setColor & setOpacity
2014-06-06 16:09:13 +08:00
andyque
a37a6737ca
refactor Text setColor & setOpacity
2014-06-06 16:08:31 +08:00
andyque
f0f4d41813
refactor Slider setColor & setOpacity
2014-06-06 16:07:47 +08:00
andyque
3c80fe53d3
refactor LoadingBar setColor & setOpacity
2014-06-06 16:03:59 +08:00
andyque
6193893b2b
refactor ImageView setColor & setOpacity
2014-06-06 16:02:44 +08:00
andyque
0805c215b3
refactor UICheckBox setColor & setOpacity
2014-06-06 16:01:55 +08:00
andyque
46ad4edab3
refactor UIButton setColor & setOpacity
2014-06-06 16:00:28 +08:00
Dhilan007
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
Frank.Xu
7ece807a63
Add shadow, outline, glow filter support for UITextField
2014-06-05 19:21:06 +08:00
Frank.Xu
b74040a2ac
Add getStringLength() support for UITextField
2014-06-05 17:59:54 +08:00
Ricardo Quesada
59b966731e
Compiles on Windows and Android
2014-06-04 09:48:35 -07:00
Ricardo Quesada
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
andyque
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
andyque
38e274de73
refact ui header file include
2014-06-04 14:56:33 +08:00
andyque
c6cb3a56fb
refactor ListView, add do Layout
2014-06-04 10:51:32 +08:00
andyque
652c214374
remove sortChildren of Layout
2014-06-04 10:10:50 +08:00
Ricardo Quesada
449b588400
Compiles on iOS
2014-06-02 16:02:54 -07:00
Ricardo Quesada
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
andyque
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
andyque
c5a118ee1b
refactor UILayoutExecutant to LayoutManager
2014-05-28 10:11:49 +08:00
minggo
9d2c765fc0
Merge pull request #6862 from favorcode/v3
...
Update UILoadingBar.h doxygen comments
2014-05-27 13:54:52 +08:00
andyque
df13d4033c
refactor Layout and Widget
2014-05-27 13:49:00 +08:00
andyque
30582ffa6f
add constness to UIPageView's removeAllPages method
2014-05-27 11:30:37 +08:00
andyque
070abfdb44
add constness to UIVideoPlayer
2014-05-27 11:30:36 +08:00
andyque
3cda4e76a0
add constness to UIImageView
2014-05-27 11:30:36 +08:00
andyque
eb91aed3f2
add constness to UICheckBox
2014-05-27 11:30:36 +08:00
andyque
f87e4243ee
add constness to UIButton
2014-05-27 11:30:36 +08:00
andyque
884d4c5d1f
add constness to UITextField
2014-05-27 11:30:36 +08:00
andyque
5da1f1f78c
add constness to UIText
2014-05-27 11:30:36 +08:00
andyque
5acd2ed89d
add constness to UISlider
2014-05-27 11:30:36 +08:00
andyque
36e7c9cdfc
add constness to UIScrollView
2014-05-27 11:30:36 +08:00
andyque
e1f9ff7eaa
add constness to UIPageView
2014-05-27 11:30:36 +08:00
andyque
78ac4b4d86
add constness to UILoadingBar
2014-05-27 11:30:35 +08:00
andyque
0518e494b1
add constness to UIListView
2014-05-27 11:30:35 +08:00
andyque
b17de0cdcb
add const to UILayout
2014-05-27 11:30:35 +08:00
andyque
e32a637bf5
add const to ui framework methods
2014-05-27 11:30:35 +08:00
andyque
9cef55d62c
issue #5176 , refactor FocusNavigationController
2014-05-27 10:20:37 +08:00
andyque
d8d5139aaf
closed #5176 , refactor UILayout and focus
2014-05-26 23:04:44 +08:00
andyque
f32044fca9
closed #5176 , fix FocusNavigationController
2014-05-26 18:38:03 +08:00
andyque
642969cc84
issue #5176 , move setting setFirstFocsuedWidget to setFocused method
2014-05-26 18:27:06 +08:00
andyque
69d5b486af
Revert "issue #5176 , fix compile error on other platforms"
...
This reverts commit 9118d7a98a
.
Conflicts:
cocos/ui/UIFocusManager.h
2014-05-26 18:19:23 +08:00
andyque
1a6dba8656
issue #5176 , refactor UIFocusManager
2014-05-26 18:17:47 +08:00
andyque
cc8b70b87d
issue #5176 , refactor UIFocusManager and UIScrollView
2014-05-26 17:34:56 +08:00
andyque
9118d7a98a
issue #5176 , fix compile error on other platforms
2014-05-26 15:35:43 +08:00
andyque
e866800044
issue #5176 , refactor UICheckBox releaseUpEvent
2014-05-26 14:44:28 +08:00
andyque
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
andyque
8112962778
issue #5183 , remove in class member initialization
2014-05-26 09:51:05 +08:00
andyque
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
andyque
d612518421
fix ui widget copyProperties issue
2014-05-23 15:03:46 +08:00
andyque
6d9a21d0ed
issue #5176 , add focus event listener to UIScrollView
2014-05-23 11:18:26 +08:00
andyque
3f363f0e51
issue #5176 , add focus to UIScrollView
2014-05-23 10:59:18 +08:00
andyque
26be2708a0
issue #5176 , refactor UIScrollView
2014-05-23 10:08:53 +08:00
andyque
65fe431eae
issue #5176 , fix a typo
2014-05-22 18:11:27 +08:00
andyque
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
andyque
c8d9ab8122
issue #5176 , refactor passTouchEventToParent method of UIWidget
2014-05-22 15:23:13 +08:00
hanbihui
76d0448b12
Update UILoadingBar.h Doxygen comments
2014-05-22 15:08:53 +08:00
andyque
4d82d8d26b
issue #5176 , rename UIScrollInterface to ScrollViewProtocol
2014-05-22 14:15:29 +08:00
andyque
2344928945
issue #5176 , refactor AutoScrollDirection in UIPageView
2014-05-22 14:09:01 +08:00
andyque
0c065b4be0
issue #5176 , refactor Layout and UIPageView
2014-05-22 13:51:44 +08:00
andyque
ebcb7b78a3
issue #5176 , refactor UIPageView
2014-05-22 11:43:02 +08:00
andyque
e70a772c0f
issue #5176 , refactor UIPageView
2014-05-22 11:01:58 +08:00
andyque
e88d91357b
issue #5176 , refacotr UIPageView
2014-05-22 11:01:58 +08:00
andyque
3b777646c4
issue #5176 . fix UIScrollView
2014-05-22 11:01:58 +08:00
andyque
e184ac9e0c
issue #5176 , refacotr UIPageView
2014-05-22 11:01:58 +08:00
andyque
e9ff42064f
issue #5176 , remove unneeded functions in UIPageView
2014-05-22 11:01:58 +08:00
andyque
d5e68e4803
issue #5176 , fix override problems
2014-05-22 11:01:58 +08:00
andyque
0e8197b6ee
issue #5176 , add UIFocusManager
2014-05-22 11:01:58 +08:00
andyque
d1df19794a
fixed ui header file include problem
2014-05-22 10:49:28 +08:00
hanbihui
5547031e5c
Update UILoadingBar.h doxygen comments
2014-05-21 16:35:47 +08:00
andyque
dbd2de63b2
issue #5183 , fix Layout visit issue
2014-05-21 15:21:55 +08:00
minggo
5a309fbc6e
Merge pull request #6721 from zifter/FixNodeConst
...
[ci skip]Getter always must be a const method.
2014-05-21 09:48:27 +08:00
minggo
dd428b527b
Merge pull request #6843 from favorcode/v3
...
[ci skip]Update UIImageView.h param name
2014-05-20 17:34:56 +08:00
hanbihui
855b8a2784
Update UIImageView.h
...
Update param name
2014-05-20 16:45:09 +08:00
andyque
723e01f5df
issue #5183 , refactor UILayoutExecutant doLayout method
2014-05-20 16:09:30 +08:00
andyque
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d22
, reversing
changes made to 6f2f2046c7
.
2014-05-20 14:36:29 +08:00
favorcode
5ed9e781e4
Update UIText.h
...
Update the doxygen comment
2014-05-20 13:05:20 +08:00
minggo
ae118a9d22
Merge pull request #6752 from andyque/refactorLayout
...
refactor Layout
2014-05-20 12:07:04 +08:00
andyque
993b735392
closed #5183 , done
2014-05-20 10:24:22 +08:00
andyque
432f688a67
issue #5183 , refactor
2014-05-20 10:16:19 +08:00
andyque
e0192e2a1b
issue #5183 , fix win32 compile error
2014-05-20 09:59:12 +08:00
andyque
fe01d12a21
issue #5183 , fix android compile error
2014-05-20 09:39:05 +08:00
andyque
28c3752641
issue #5183 , refacotr some variable names
2014-05-20 09:36:17 +08:00
andyque
834a72315a
issue #5183 , add deprecated function for Widget
2014-05-19 17:43:27 +08:00
andyque
a9e1c50897
issue #5183 , refactor UIScrollView
2014-05-19 17:34:48 +08:00
andyque
ee24e137f7
issue #5183 , refactor obscure functions
2014-05-19 17:18:04 +08:00
andyque
121d6d3109
issue #5183 , refactor
2014-05-19 16:51:25 +08:00
hyq
11dcf1e1dd
fix UIText's fontSize
...
if set fontsize before setting font family, fontsize was wrong
2014-05-19 11:38:45 +08:00
zifter
d875f27c67
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
...
Conflicts:
cocos/ui/UIListView.h
cocos/ui/UIPageView.h
2014-05-17 10:40:36 +03:00
andyque
b434840bc9
issue #5183 , add layout parameter type to widget for convenient access
2014-05-16 10:33:28 +08:00
andyque
1b3c28ea90
Merge branch 'v3' into refactorLayout
...
Conflicts:
cocos/ui/UILayout.cpp
2014-05-16 10:22:53 +08:00
minggo
39d3d65157
Merge pull request #6754 from minggo/monkey-test
...
Matrix -> Mat4
2014-05-15 11:10:39 +08:00
minggo
67f809e223
Matrix -> Mat4
2014-05-15 11:09:17 +08:00
andyque
cfa0342618
Merge branch 'v3' into issue5005
...
Conflicts:
cocos/ui/UIWidget.cpp
2014-05-15 11:03:03 +08:00
andyque
3f08dd2758
issue #5183 , remove no needed type
2014-05-15 10:48:33 +08:00
andyque
b32ca246e7
issue #5183 , done
2014-05-15 10:44:19 +08:00
andyque
5697d2417a
issue #5183 , done
2014-05-15 10:23:25 +08:00
andyque
0639e49031
issue #5183 , add LayoutProtocol
2014-05-15 10:07:42 +08:00
Ricardo Quesada
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
andyque
967c071c68
issue #5183 , refator LayoutExecutant
2014-05-14 18:24:23 +08:00
andyque
8c8f9611f7
issue #5183 , add CCLayoutExecutant file
2014-05-14 18:03:44 +08:00
minggo
db0ea94b8a
Merge pull request #6730 from andyque/refactor5110
...
refactor ui framework
2014-05-14 17:47:47 +08:00
andyque
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
andyque
9d5c2ba773
closed #5110 , add const specifier to getStringLength function
2014-05-14 16:25:30 +08:00
andyque
09fce798f0
closed #5110 , add const reference to typedef
2014-05-14 16:14:28 +08:00
andyque
437b30487c
issue #5110 , refactor UITextBMFont
2014-05-14 16:02:31 +08:00
andyque
76cefcaa3f
issue #5110 , refactor UITextAtlas
2014-05-14 15:51:50 +08:00
andyque
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
andyque
578ff2735d
issue #5110 , fix VideoPlayer android compile error
2014-05-14 14:44:04 +08:00
andyque
46cf6251b6
issue #5110 , rename a member variable and delete gui prefix in ui tests
2014-05-14 11:26:04 +08:00
andyque
e6a36fde18
issue #5110 , refactor VideoPlayer
2014-05-14 11:18:11 +08:00
andyque
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
andyque
ca4a7a7e53
issue #4900 , refactor
2014-05-14 09:55:55 +08:00
andyque
92d9120967
issue #4900 , refactor
2014-05-14 09:37:21 +08:00
andyque
df86b07f15
closed #5005 , refactor
2014-05-14 09:23:56 +08:00
zifter
249dffa346
getter always must be a const method.
2014-05-13 23:28:04 +03:00
andyque
a28bdb0ed5
closed #5005 , refactor
2014-05-13 18:41:38 +08:00
andyque
2a25afbb76
closed #4900 . add comment
2014-05-13 18:15:53 +08:00
andyque
31a2194dcb
closed #4900 , add TTF font to UIText
2014-05-13 17:45:15 +08:00
andyque
41fe56ee70
closed #5005 , fix a null pointer exception
2014-05-13 17:12:48 +08:00
andyque
2d88c8ea92
closed #5005 , fix visible and enable issue
2014-05-13 16:37:41 +08:00
andyque
1c47c833c6
issue #5005 , fixed widget visit method
2014-05-13 14:56:44 +08:00
andyque
810c25b85e
Merge branch 'v3' into issue5005
2014-05-13 14:52:49 +08:00
andyque
1a319b3f12
issue #5005 , deprecated setTouchEnabled
2014-05-13 14:52:27 +08:00
minggo
75196d96ce
Merge pull request #6696 from andyque/issue5121
...
issue 5121, fix loading bar init flicker and refator percentage
2014-05-13 13:45:01 +08:00
andyque
7049fd253d
closed #5121 , add const to getPercent method
2014-05-13 12:06:28 +08:00
andyque
b2397f4059
issue #5005 , fix widget hittest problem
2014-05-13 12:04:43 +08:00
minggo
ccb55448da
Merge pull request #6685 from andyque/refactor5118
...
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-13 11:35:36 +08:00
andyque
7db02fc0e9
closed #5121 , change percentage from int to float
2014-05-13 10:34:08 +08:00
andyque
5e01c61d8b
closed #5118 , fix indent
2014-05-13 10:15:29 +08:00
andyque
9125673c1c
issue #5121 , fix LoadingBar percentage when initialize
2014-05-13 10:13:08 +08:00
Dale Stammen
78df412669
updated project files to latest version of cocos2d
2014-05-12 09:27:52 -07:00
Dale Stammen
bad71e38d0
fixed for ABSOLUTE and RELATIVE winrt compiler reserved words
2014-05-12 09:26:39 -07:00
andyque
a0a4df5ac5
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-12 18:00:54 +08:00
andyque
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
andyque
da3e794631
issue #5057 , convert const char* to std::string&
2014-05-12 14:59:00 +08:00
andyque
56f417c520
issue #5057 , fix windows compile error
2014-05-12 14:11:44 +08:00
andyque
8232b98525
issue #5057 , fix android compile error
2014-05-12 13:54:30 +08:00
andyque
b735ce3ffc
issue #5057 , fix andriod and linux compile
2014-05-12 11:55:00 +08:00
andyque
9d7d06a1f8
issue #5047 , refactor UIVideoPlayer
2014-05-12 11:35:57 +08:00
andyque
4f3c128c4f
issue #5057 , refator UITextField
2014-05-12 11:29:22 +08:00
andyque
eeaf48d3e5
issue #5047 , refactor UISlider
2014-05-12 11:17:06 +08:00
andyque
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
andyque
ba802e1308
issue #5057 , refactor UIRichText
2014-05-12 10:39:30 +08:00
andyque
77a463bac3
issue #5057 , refactor UIPageView
2014-05-12 10:31:52 +08:00
andyque
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
andyque
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
Ricardo Quesada
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
Ricardo Quesada
78dd92a7ef
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
andyque
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
andyque
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
andyque
0c0f18e7f3
issue #5047 , refactor LayoutParameterType
2014-05-09 17:38:05 +08:00
andyque
d12a71f738
issue #5057 , refactor UILayoutDefine
2014-05-09 17:16:11 +08:00
andyque
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
andyque
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
andyque
305f052344
issue #5057 , refactor LayoutClippingType
2014-05-09 16:31:22 +08:00
andyque
451b7a1b6b
issue #5057 , refactor UICheckBox event callback
2014-05-09 16:04:55 +08:00
andyque
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
andyque
d799ffce40
issue #5057 , remove include dependency
2014-05-09 15:32:51 +08:00
andyque
f070fc335f
issue #5057 , refactor BrightStyle to strong typed enum
2014-05-09 15:23:34 +08:00
andyque
762e8d9249
issue #5057 , refactor WidgetType to strong typed enum
2014-05-09 15:16:33 +08:00
andyque
6a7277c38f
issue #5057 , refactor TextureResType to strong typed enum
2014-05-09 14:56:05 +08:00
andyque
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
Dhilan007
06f264e87d
rename VideoWidget to VideoPlayer.
2014-05-09 11:30:07 +08:00
andyque
21e4d05e6e
issue #5057 , refactor SEL_TouchEvent to std::function
2014-05-09 11:28:36 +08:00
andyque
a699230e75
issue #5057 , replace license
2014-05-09 09:39:18 +08:00
andyque
1d7726133c
issue #5057 , refactor enum SizeType to strong typed enum
2014-05-09 09:37:51 +08:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
Dale Stammen
eea1ba6946
added missing files to projects
2014-05-08 10:11:42 -07:00
andyque
fd362d2ace
issue #5057 . deprcated PositionType and make a new enum class instead
2014-05-08 18:25:49 +08:00
Dhilan007
af26fb9b07
issue #4870:Add a ui widget of playing video
2014-05-08 18:13:50 +08:00
Dhilan007
bda73bc7b3
issue #4868:Use system widget to play video on iOS
2014-05-08 18:12:53 +08:00
andyque
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
minggo
a8d728ffc9
Merge pull request #6610 from zawasp/vs2013project
...
upgrade win32 projects for Visual Studio 2013
2014-05-08 15:40:02 +08:00
andyque
238ffcc545
issue #4861 , fix pass focus to child
2014-05-08 11:24:09 +08:00
andyque
b5f1f7455b
issue #4861 , fix a problem when layout focus loops
2014-05-08 10:46:05 +08:00
Mircea Rila
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
andyque
05b7d274c8
issue #4861 . fix distance calculation
2014-05-07 18:27:05 +08:00
andyque
def0505ba7
closed #4861 , refactor
2014-05-07 14:26:41 +08:00
andyque
1282252c25
closed #4861 , refactor
2014-05-07 14:06:44 +08:00
andyque
8baa88e2e1
closed #4861 , fixed temparory variable issue
2014-05-07 11:55:00 +08:00
andyque
ef70c684de
issue #4861 , add requestFocus method and the layout current can get focus
2014-05-07 10:23:57 +08:00
andyque
62a66872aa
issue #4861 , fixed some boundary conditions
2014-05-07 10:05:20 +08:00
andyque
9d71ae29b9
issue #4861 . fixed all widget focus diabled bug
2014-05-06 17:28:12 +08:00
andyque
a15dd55baa
closed #3861 , fixed some typo and indent problem
2014-05-06 12:04:52 +08:00
andyque
bcd2d3ccb3
issue #3861 , fix layout contentSize caculation
2014-05-06 11:46:28 +08:00
andyque
2d0de93baf
issue #4861 , fixed a widget bug and add VBox test
2014-05-05 11:37:40 +08:00
andyque
afb65bbebd
issue #4861 , fix widget query method
2014-05-05 11:37:39 +08:00
andyque
503be87675
issue #4861 . refactor UILayout to search widget by index
2014-05-05 11:37:39 +08:00
andyque
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
andyque
9383900123
issue #4861 . cleanup some code of UILayout and UIWidget
2014-05-05 11:37:39 +08:00
andyque
b35ddfe5b5
issue #4861 , add focus functionality into Widget class
2014-05-05 11:37:38 +08:00
andyque
1dee81a166
issue #4861 , refactor setFocused into setHilighted
2014-05-05 11:37:38 +08:00
Ricardo Quesada
462338879e
rolling back physics in layer
2014-05-01 16:42:35 -07:00
Ricardo Quesada
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
Ricardo Quesada
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
Ricardo Quesada
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
Ricardo Quesada
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00