Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
History
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
..
GUI Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
assets-manager issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
physics-nodes remove kazmath include file 2014-04-16 14:08:58 +08:00
proj.win32 closed #4291：open CCEditBox as modal dialog 2014-03-06 22:17:20 +08:00
proj.wp8 added wp8 support files and projects 2014-03-28 15:42:41 -07:00
Android.mk issue #4097: Deletes CCEditBoxImplTizen.h/.cpp. 2014-02-20 16:42:28 +08:00
CMakeLists.txt issue #4097: Deletes CCEditBoxImplTizen.h/.cpp. 2014-02-20 16:42:28 +08:00
ExtensionMacros.h issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
cocos-ext.h Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file. 2014-01-26 19:35:21 +08:00