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 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 		2015-07-21 11:39:24 +08:00
..
UIEditBox Merge pull request #12848 from Mazyod/v3 2015-07-18 23:21:27 +08:00
proj.win32 Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
Android.mk Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
CMakeLists.txt Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
GUIDefine.h ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
GUIExport.h added check for WinRT and WP8 2014-10-14 14:22:19 -07:00
UIAbstractCheckButton.cpp Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 2015-07-03 10:23:49 +08:00
UIAbstractCheckButton.h Correct the wrong comment for lua 2015-07-02 15:19:50 +09:00
UIButton.cpp add jumpToPage API to PageView. 2015-07-16 11:33:57 +08:00
UIButton.h Merge pull request #12054 from andyque/Feature_Add_Title_Alignment_for_Button 2015-05-27 16:09:06 +08:00
UICheckBox.cpp Fix check box front cross texture expand to normal size when change status between normal and disable frequency 2015-07-02 10:29:53 +08:00
UICheckBox.h Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09: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 update for lay out 2014-12-22 11:20:03 +08:00
UIHelper.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UIImageView.cpp improve imageView memory usage 2015-06-05 14:19:05 +08:00
UIImageView.h improve imageView memory usage 2015-06-05 14:19:05 +08:00
UILayout.cpp Fixes some warnings and a related bug in CCSprite. 2015-07-07 23:01:24 +08:00
UILayout.h fix camera mask of listview 2015-06-29 14:41:03 +08:00
UILayoutComponent.cpp Fix 2015-07-06 16:45:04 +08:00
UILayoutComponent.h Update comment for Lua 2015-03-30 15:47:47 +08:00
UILayoutManager.cpp Merge pull request #7900 from minggo/setposition-optimize 2014-08-28 14:31:54 +08:00
UILayoutManager.h remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08: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 Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range. 2015-07-20 17:50:02 +08:00
UIListView.h Update comment for Lua 2015-03-30 15:47:47 +08:00
UILoadingBar.cpp fix enum class wrong indentation 2015-06-05 17:23:32 +08:00
UILoadingBar.h optimize UILoadingBar memory usage 2015-06-05 15:57:39 +08:00
UIPageView.cpp add jumpToPage API to PageView. 2015-07-16 11:33:57 +08:00
UIPageView.h add jumpToPage API to PageView. 2015-07-16 11:33:57 +08:00
UIRadioButton.cpp Fix radio button group clear issue 2015-07-04 09:57:54 +09:00
UIRadioButton.h Add class documentation 2015-07-02 15:20:06 +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 change return const value to value 2014-09-12 14:39:22 +08:00
UIRichText.h Update comment for Lua 2015-03-30 15:47:47 +08:00
UIScale9Sprite.cpp Merge pull request #12874 from pandamicro/v3.7-release 2015-07-16 16:15:26 +08:00
UIScale9Sprite.h fixed Scale9Sprite gray state issue. 2015-07-15 14:35:13 +08:00
UIScrollView.cpp Correct the wrong boolean statement and make it easy to read 2015-07-14 11:58:44 +09:00
UIScrollView.h Correct a typo 2015-07-14 10:17:05 +09:00
UIScrollViewBar.cpp Add methods to manipulate scroll bar's opacity 2015-07-13 21:28:16 +09:00
UIScrollViewBar.h Add methods to manipulate scroll bar's opacity 2015-07-13 21:28:16 +09:00
UISlider.cpp Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
UISlider.h Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-30 14:32:14 +08:00
UIText.cpp Copy missing text color property of ui::Text. 2015-05-15 16:04:34 +08:00
UIText.h fix ui::Text outline don't change content size 2015-04-10 15:33:48 +08:00
UITextAtlas.cpp Additional unnecessary set dirty of ui widgets 2014-11-25 20:42:03 +09:00
UITextAtlas.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UITextBMFont.cpp update uiTextBMFont setString 2015-01-20 14:20:20 +08:00
UITextBMFont.h [ci skip] Add javascript notes... 2015-03-30 21:38:32 +08:00
UITextField.cpp Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08:00
UITextField.h Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08: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 Fixed: #12097 VideoPlayer on Android ignores search paths 2015-05-29 10:17:40 +03:00
UIVideoPlayer-ios.mm Fixed: #12097 VideoPlayer on Android ignores search paths 2015-05-29 10:17:40 +03:00
UIVideoPlayer.h fix tons of warnings 2015-07-15 12:04:48 +08: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 Fix the compile error on the win32 2015-04-20 11:46:48 +08:00
UIWebView.mm Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
UIWebViewImpl-android.cpp Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08: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 add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
UIWidget.h [ci skip] add comment for UIWidget::_hittedByCamera. 2015-07-01 11:03:09 +08:00