Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest
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
..
CustomTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CustomWidget replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIButtonTest Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UICheckBoxTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIImageViewTest Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UILayoutTest Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIListViewTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UILoadingBarTest Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIPageViewTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIRichTextTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIScrollViewTest Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UISliderTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UITextAtlasTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UITextBMFontTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UITextFieldTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UITextTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIWidgetAddNodeTest replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CocoStudioGUITest.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CocoStudioGUITest.h replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CocosGUIScene.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CocosGUIScene.h replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CustomGUIScene.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
CustomGUIScene.h replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
GUIEditorTest.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
GUIEditorTest.h replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIScene.cpp replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
UIScene.h Merge branch 'develop' into fix_gui_to_ui 2014-03-12 10:09:09 +08:00
UISceneManager.cpp Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
UISceneManager.h Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
UISceneManager_Editor.cpp Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
UISceneManager_Editor.h Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
UIScene_Editor.cpp issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
UIScene_Editor.h Merge branch 'develop' into fix_gui_to_ui 2014-03-12 10:09:09 +08:00