61 Commits

Author	SHA1	Message	Date
andyque	9125673c1c	issue #5121, fix LoadingBar percentage when initialize	2014-05-13 10:13:08 +08:00
andyque	8232b98525	issue #5057, fix android compile error	2014-05-12 13:54:30 +08:00
andyque	7f15a14d55	issue #5057, refactor LoadingBar	2014-05-12 10:12:22 +08:00
andyque	6a7277c38f	issue #5057, refactor TextureResType to strong typed enum	2014-05-09 14:56:05 +08:00
Huabing.Xu	3b83d52f95	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/ui/UIButton.cpp cocos/ui/UIButton.h cocos/ui/UICheckBox.cpp cocos/ui/UICheckBox.h cocos/ui/UIImageView.cpp cocos/ui/UIImageView.h cocos/ui/UILayout.cpp cocos/ui/UILayout.h cocos/ui/UILoadingBar.cpp cocos/ui/UIRichText.h cocos/ui/UISlider.cpp cocos/ui/UIText.cpp cocos/ui/UIText.h cocos/ui/UITextAtlas.cpp cocos/ui/UITextAtlas.h cocos/ui/UITextBMFont.cpp cocos/ui/UITextBMFont.h cocos/ui/UITextField.cpp cocos/ui/UITextField.h cocos/ui/UIWidget.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp	2014-04-19 00:30:34 +08:00
CaiWenzhi	19f6526ef8	Widget supports contentsize	2014-04-17 14:08:25 +08:00
Huabing.Xu	63b52dd287	replace Point with Vector2 in cocos folder cpp file	2014-04-15 18:13:57 +08:00
andyque	48429f5738	issue #4636. finish UILoadingBar	2014-04-03 11:34:06 +08:00
andyque	a03dc76f7d	issue #4636, add parameter create method for UILoadingBar	2014-04-03 10:07:46 +08:00
CaiWenzhi	2dffcb9808	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00