Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
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
..
2d Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
audio Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-14 14:08:19 +08:00
base Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
deprecated replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
editor-support Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
math remove kazmath include file 2014-04-16 14:08:58 +08:00
network = [FIX]: HTTPClient should not report 2xx status codes as errors! 2014-04-09 11:07:51 +04:00
physics replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
scripting/lua-bindings Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
storage added wp8 support files and projects 2014-03-28 15:39:20 -07:00
ui Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00