Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/gui
History
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 		2014-03-03 11:27:42 -08:00
..
proj.win32 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
Android.mk Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
CMakeLists.txt Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
CocosGUI.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CocosGUI.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIButton.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIButton.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UICheckBox.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UICheckBox.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIHelper.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIHelper.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIImageView.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIImageView.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UILayout.cpp Merge branch 'develop' into visit_draw_improved 2014-03-03 11:27:42 -08:00
UILayout.h Merge branch 'develop' into visit_draw_improved 2014-03-03 11:27:42 -08:00
UILayoutDefine.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UILayoutDefine.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UILayoutParameter.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UILayoutParameter.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIListView.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIListView.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UILoadingBar.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UILoadingBar.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIPageView.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIPageView.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIScrollInterface.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UIScrollView.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIScrollView.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UISlider.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UISlider.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIText.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIText.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UITextAtlas.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UITextAtlas.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UITextBMFont.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UITextBMFont.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
UITextField.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UITextField.h Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
UIWidget.cpp Merge branch 'develop' into visit_draw_improved 2014-03-03 11:27:42 -08:00
UIWidget.h Cache working OK. 2014-02-28 16:10:48 -08:00