Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/ui
History
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 		2015-12-20 22:56:33 +08:00
..
UIEditBox Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
proj.win32 PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
Android.mk PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
CMakeLists.txt PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
CocosGUI.cpp
…
CocosGUI.h Editing code as comment. 2015-12-04 10:43:39 +08:00
GUIDefine.h ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
GUIExport.h Combine Studio change for UI components 2015-11-18 13:38:29 +08:00
UIAbstractCheckButton.cpp Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UIAbstractCheckButton.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UIButton.cpp fix #12249 2015-12-14 11:53:09 +08:00
UIButton.h change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
UICheckBox.cpp Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
UICheckBox.h Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
UIDeprecated.cpp add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
UIDeprecated.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIHBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIHBox.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UIHelper.cpp Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display. 2015-10-14 13:58:58 +08:00
UIHelper.h Fix typos in documentation 2015-10-23 16:59:51 +09:00
UIImageView.cpp fix #12249 2015-12-14 11:53:09 +08:00
UIImageView.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UILayout.cpp fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
UILayout.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UILayoutComponent.cpp Merge pull request #14419 from xiaofeng11/v3_combine_ui 2015-11-25 17:19:54 +08:00
UILayoutComponent.h Fix typos in documentation 2015-10-23 16:59:51 +09:00
UILayoutManager.cpp Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
UILayoutManager.h Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
UILayoutParameter.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UILayoutParameter.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
UIListView.cpp PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
UIListView.h fix pageview child size 2015-12-14 15:29:02 +08:00
UILoadingBar.cpp fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
UILoadingBar.h loading bar use new scale9 feature 2015-12-09 10:41:31 +08:00
UIPageView.cpp fix pageview child size 2015-12-14 15:29:02 +08:00
UIPageView.h fix pageview child size 2015-12-14 15:29:02 +08:00
UIPageViewIndicator.cpp PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
UIPageViewIndicator.h PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
UIRadioButton.cpp Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
UIRadioButton.h Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
UIRelativeBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIRelativeBox.h Update comment for Lua 2015-03-30 15:47:47 +08:00
UIRichText.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
UIRichText.h Support the new line element. Fixed a problem that protrude from the drawing area. 2015-09-28 14:47:09 +09:00
UIScale9Sprite.cpp Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:56:33 +08:00
UIScale9Sprite.h Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
UIScrollView.cpp fix scrollview render error 2015-12-10 13:37:07 +08:00
UIScrollView.h Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
UIScrollViewBar.cpp Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places. 2015-10-28 16:56:35 +09:00
UIScrollViewBar.h Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
UISlider.cpp slider misprint fix 2015-12-17 12:06:39 +03:00
UISlider.h slider misprint fix 2015-12-17 12:06:39 +03:00
UIText.cpp update for text clone 2015-12-10 13:17:31 +08:00
UIText.h update for code format 2015-12-11 12:04:54 +08:00
UITextAtlas.cpp Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UITextAtlas.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UITextBMFont.cpp Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UITextBMFont.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
UITextField.cpp Fix TextField won't show security text when first time set password enable 2015-12-19 15:44:39 +08:00
UITextField.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
UIVBox.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
UIVBox.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UIVideoPlayer-android.cpp Fix typos 2015-10-09 17:59:11 +09:00
UIVideoPlayer-ios.mm Fixed: #12097 VideoPlayer on Android ignores search paths 2015-05-29 10:17:40 +03:00
UIVideoPlayer.h Fix typos in documentation 2015-10-23 16:59:51 +09:00
UIWebView-inl.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIWebView.cpp remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
UIWebView.h Update comment 2015-10-21 16:55:45 +03:00
UIWebView.mm Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
UIWebViewImpl-android.cpp Revert: Fix crash in web view on android 2015-10-21 16:54:41 +03:00
UIWebViewImpl-android.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIWebViewImpl-ios.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
UIWebViewImpl-ios.mm Fix web view leak on iOS 2015-05-08 15:19:14 +03:00
UIWidget.cpp Merge pull request #14419 from xiaofeng11/v3_combine_ui 2015-11-25 17:19:54 +08:00
UIWidget.h Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets 2015-11-17 11:24:27 +08:00