axmol/cocos/ui
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
..
proj.win32 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
proj.wp8 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
Android.mk Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
CMakeLists.txt Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
GUIDefine.h refact ui header file include 2014-06-04 14:56:33 +08:00
GUIExport.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIButton.cpp refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
UIButton.h refactor UIButton 2014-07-30 15:19:39 +08:00
UICheckBox.cpp fix opacity issue when replace Widget textures 2014-07-08 11:30:27 +08:00
UICheckBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIDeprecated.cpp add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
UIDeprecated.h add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
UIHBox.cpp refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
UIHBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIHelper.cpp refactor 2014-07-30 10:45:35 +08:00
UIHelper.h refactor 2014-07-30 10:45:35 +08:00
UIImageView.cpp refactor, improve imageView stability 2014-07-30 17:29:22 +08:00
UIImageView.h refactor ImageView 2014-07-30 15:27:18 +08:00
UILayout.cpp Merge branch 'v3' into v3_pr 2014-08-01 15:11:34 +08:00
UILayout.h refactor Layout 2014-07-30 16:33:37 +08:00
UILayoutManager.cpp issue #5161, deprecated getSize 2014-06-20 11:18:53 +08:00
UILayoutManager.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UILayoutParameter.cpp fix margin zero 2014-06-27 15:39:10 +08:00
UILayoutParameter.h fix warn 2014-07-25 14:38:02 +08:00
UIListView.cpp fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
UIListView.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UILoadingBar.cpp refactor loadingBar 2014-07-30 16:08:29 +08:00
UILoadingBar.h refactor loadingBar 2014-07-30 16:08:29 +08:00
UIPageView.cpp remove unused functions 2014-07-16 16:28:01 +08:00
UIPageView.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIRelativeBox.cpp refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
UIRelativeBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIRichText.cpp refactor 2014-07-30 10:45:35 +08:00
UIRichText.h fix RichText visit issue 2014-07-24 11:51:47 +08:00
UIScale9Sprite.cpp refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
UIScale9Sprite.h refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
UIScrollView.cpp fix scroll 2014-07-02 11:48:28 +08:00
UIScrollView.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UISlider.cpp fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
UISlider.h refactor Slider control 2014-07-30 15:52:27 +08:00
UIText.cpp Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
UIText.h Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
UITextAtlas.cpp issue #5161, replace all _size to _contentSize 2014-06-20 10:40:16 +08:00
UITextAtlas.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UITextBMFont.cpp fix opacity issue when replace Widget textures 2014-07-08 11:30:27 +08:00
UITextBMFont.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UITextField.cpp refactor 2014-07-30 10:45:35 +08:00
UITextField.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIVBox.cpp refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
UIVBox.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
UIVideoPlayer.h Fixed VideoPlayer can't quitting the full screen mode by press the back key. 2014-07-17 21:10:26 +08:00
UIVideoPlayerAndroid.cpp GLView Hook 2014-07-31 00:53:04 +08:00
UIVideoPlayerIOS.mm GLView Hook 2014-07-31 00:53:04 +08:00
UIWidget.cpp Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf 2014-07-28 14:04:20 +08:00
UIWidget.h Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00