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