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 |