Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,249 Commits 4 Branches 31 Tags 1.1 GiB
Commit Graph

721 Commits

Author SHA1 Message Date
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