axmol/cocos/ui
Ricardo Quesada 78dd92a7ef Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
..
proj.win32 upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 2014-05-07 17:41:04 +03:00
proj.wp8 added missing files to projects 2014-05-08 10:11:42 -07:00
Android.mk rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
CCProtectedNode.cpp rolling back physics in layer 2014-05-01 16:42:35 -07:00
CCProtectedNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CMakeLists.txt linux cmake improvements 2014-05-01 13:01:51 -07:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
GUIDefine.h Removed unused comments in GUIDefine.h 2014-04-10 17:15:59 +08:00
UIButton.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIButton.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UICheckBox.cpp closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
UICheckBox.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIHBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIImageView.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UIImageView.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UILayout.cpp moves shaders files from 2d/ to renderer/ 2014-05-08 18:01:48 -07:00
UILayout.h issue #4861, fix pass focus to child 2014-05-08 11:24:09 +08:00
UILayoutDefine.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutDefine.h let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutParameter.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
UILayoutParameter.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIListView.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
UIListView.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UILoadingBar.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UILoadingBar.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UIPageView.cpp closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
UIPageView.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UIRelativeBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRelativeBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRichText.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIRichText.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIScrollInterface.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UIScrollView.cpp closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
UIScrollView.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
UISlider.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UISlider.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIText.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UIText.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextAtlas.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextAtlas.h Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextBMFont.cpp Widget supports contentsize 2014-04-17 14:08:25 +08:00
UITextBMFont.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UITextField.cpp Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UITextField.h Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-19 00:30:34 +08:00
UIVBox.cpp Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIVBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIVideoPlayer.h rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
UIVideoPlayerAndroid.cpp rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
UIVideoPlayerIOS.mm rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
UIWidget.cpp issue #4861. fix distance calculation 2014-05-07 18:27:05 +08:00
UIWidget.h issue #4861. fix distance calculation 2014-05-07 18:27:05 +08:00