axmol/cocos/ui
Huabing.Xu ec5398e7c6 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
..
proj.win32 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
proj.wp8 added wp8 support files and projects 2014-03-28 15:39:20 -07:00
Android.mk Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
CCProtectedNode.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-14 14:08:19 +08:00
CCProtectedNode.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
CMakeLists.txt Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
GUIDefine.h Removed unused comments in GUIDefine.h 2014-04-10 17:15:59 +08:00
UIButton.cpp Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
UIButton.h issue #4636. fix some typo 2014-04-03 17:13:24 +08:00
UICheckBox.cpp closed #4636. remove Hungary style 2014-04-04 18:26:53 +08:00
UICheckBox.h issue #4636, add parameter create method to UICheckBox 2014-04-03 10:07:46 +08:00
UIHBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIImageView.cpp closed #4636. remove Hungary style 2014-04-04 18:26:53 +08:00
UIImageView.h issue #4636. fix some typo 2014-04-03 17:13:24 +08:00
UILayout.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-14 14:08:19 +08:00
UILayout.h remove kmMat4 interface in cocostudio and UI 2014-04-09 14:44:54 +08:00
UILayoutDefine.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutDefine.h let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutParameter.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutParameter.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIListView.cpp fixed bugs 2014-03-31 11:34:26 +08:00
UIListView.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
UILoadingBar.cpp issue #4636. finish UILoadingBar 2014-04-03 11:34:06 +08:00
UILoadingBar.h issue #4636, add parameter create method for UILoadingBar 2014-04-03 10:07:46 +08:00
UIPageView.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UIPageView.h closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 2014-03-21 13:44:29 +08:00
UIRelativeBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRelativeBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRichText.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-11 11:18:13 +08:00
UIRichText.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
UIScrollInterface.h let ios project compile correct 2014-03-11 18:48:26 +08:00
UIScrollView.cpp Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
UIScrollView.h Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
UISlider.cpp issue #4636, finish UISlider 2014-04-03 15:33:57 +08:00
UISlider.h issue #4636, finish UISlider 2014-04-03 15:33:57 +08:00
UIText.cpp Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
UIText.h issue #4636. add parameter create function for UIText 2014-04-03 10:07:46 +08:00
UITextAtlas.cpp issue #4636. add parameter create method to UITextAtlas 2014-04-03 10:07:46 +08:00
UITextAtlas.h issue #4636. add parameter create method to UITextAtlas 2014-04-03 10:07:46 +08:00
UITextBMFont.cpp issue #4636, finish UITextBMFont 2014-04-03 15:45:06 +08:00
UITextBMFont.h issue #4636. add parameter create method to UITextBMFont 2014-04-03 10:07:46 +08:00
UITextField.cpp Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
UITextField.h issue #4636. refactor Scale9Sprite 2014-04-03 10:07:47 +08:00
UIVBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIVBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIWidget.cpp visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00
UIWidget.h visit() using Matrix instead of kmMat4 2014-04-08 21:45:54 +08:00