Commit Graph

382 Commits

Author SHA1 Message Date
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
Huabing.Xu 1a454590e7 changed project file 2014-04-02 15:06:42 +08:00
James Chen 48839b9d4d closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
minggo 504eea0269 use xxhash to generate material id 2014-03-31 13:47:07 +08:00
Darragh Coy 036dc5542c Add cocos2d::RefPtr<T>
This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.
2014-03-26 15:30:15 -07:00
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
James Chen f6b94d8c3e Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target. 2014-03-24 10:23:21 +08:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
andyque 2dcc600fa1 remove unused accelerometer 2014-03-20 14:29:05 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
andyque 23c3fabeb2 fix box2d ios & mac library warnings 2014-03-20 10:18:56 +08:00
andyque d7b3737605 fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings 2014-03-20 10:14:25 +08:00
boyu0 a54bfb223e fix typo, add release condition link arguments. 2014-03-14 14:33:33 +08:00
boyu0 38a1b13415 extract arm64 architectures form .a file, add condition link arguments. 2014-03-14 14:18:13 +08:00
CaiWenzhi b8ce59962a Fixed bug of ScrollView 2014-03-13 10:11:41 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
andyque 8e125734fe Merge branch 'develop' into fix_gui_to_ui
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/cpp-tests/Resources/cocosgui/100/100.ExportJson
	samples/cpp-tests/Resources/cocosgui/100/1000.plist
	samples/cpp-tests/Resources/cocosgui/100/1000.png
	samples/cpp-tests/Resources/cocosgui/CloseNormal.png
	samples/cpp-tests/Resources/cocosgui/CloseSelected.png
	samples/cpp-tests/Resources/cocosgui/CocoGUISample.json
	samples/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json
	samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist
	samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png
	samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson
	samples/cpp-tests/Resources/cocosgui/Hello.png
	samples/cpp-tests/Resources/cocosgui/Marker Felt.ttf
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
	samples/cpp-tests/Resources/cocosgui/UITest/UITest.json
	samples/cpp-tests/Resources/cocosgui/UITest/b1.png
	samples/cpp-tests/Resources/cocosgui/UITest/b2.png
	samples/cpp-tests/Resources/cocosgui/UITest/background.png
	samples/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/UITest/f1.png
	samples/cpp-tests/Resources/cocosgui/UITest/f2.png
	samples/cpp-tests/Resources/cocosgui/UITest/r1.png
	samples/cpp-tests/Resources/cocosgui/UITest/r2.png
	samples/cpp-tests/Resources/cocosgui/UITest/ribbon.png
	samples/cpp-tests/Resources/cocosgui/animationbuttonnormal.png
	samples/cpp-tests/Resources/cocosgui/animationbuttonpressed.png
	samples/cpp-tests/Resources/cocosgui/arrow.png
	samples/cpp-tests/Resources/cocosgui/b11.png
	samples/cpp-tests/Resources/cocosgui/backtotopnormal.png
	samples/cpp-tests/Resources/cocosgui/backtotoppressed.png
	samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt
	samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.png
	samples/cpp-tests/Resources/cocosgui/button.png
	samples/cpp-tests/Resources/cocosgui/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosgui/ccicon.png
	samples/cpp-tests/Resources/cocosgui/check_box_active.png
	samples/cpp-tests/Resources/cocosgui/check_box_active_disable.png
	samples/cpp-tests/Resources/cocosgui/check_box_active_press.png
	samples/cpp-tests/Resources/cocosgui/check_box_normal.png
	samples/cpp-tests/Resources/cocosgui/check_box_normal_disable.png
	samples/cpp-tests/Resources/cocosgui/check_box_normal_press.png
	samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png
	samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png
	samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png
	samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png
	samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png
	samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/111.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/12.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/13.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/14.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/15.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/2.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png
	samples/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png
	samples/cpp-tests/Resources/cocosgui/examples/examples.json
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
	samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
	samples/cpp-tests/Resources/cocosgui/green_edit.png
	samples/cpp-tests/Resources/cocosgui/grossini-aliases.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
	samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
	samples/cpp-tests/Resources/cocosgui/labelatlas.png
	samples/cpp-tests/Resources/cocosgui/loadingbar.png
	samples/cpp-tests/Resources/cocosgui/scrollviewbg.png
	samples/cpp-tests/Resources/cocosgui/slidbar.png
	samples/cpp-tests/Resources/cocosgui/sliderProgress.png
	samples/cpp-tests/Resources/cocosgui/sliderProgress2.png
	samples/cpp-tests/Resources/cocosgui/sliderThumb.png
	samples/cpp-tests/Resources/cocosgui/sliderTrack.png
	samples/cpp-tests/Resources/cocosgui/sliderTrack2.png
	samples/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png
	samples/cpp-tests/Resources/cocosgui/sliderballnormal.png
	samples/cpp-tests/Resources/cocosgui/sliderballpressed.png
	samples/cpp-tests/Resources/cocosgui/switch-mask.png
	samples/cpp-tests/Resources/cocosui/100/100.ExportJson
	samples/cpp-tests/Resources/cocosui/100/1000.plist
	samples/cpp-tests/Resources/cocosui/100/1000.png
	samples/cpp-tests/Resources/cocosui/CloseNormal.png
	samples/cpp-tests/Resources/cocosui/CloseSelected.png
	samples/cpp-tests/Resources/cocosui/CocoGUISample.json
	samples/cpp-tests/Resources/cocosui/CocoGUI_PageView_Sample.json
	samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.plist
	samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.png
	samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson
	samples/cpp-tests/Resources/cocosui/Hello.png
	samples/cpp-tests/Resources/cocosui/Marker Felt.ttf
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/silder_progressBar.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar_button.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/background.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
	samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
	samples/cpp-tests/Resources/cocosui/UITest/UITest.json
	samples/cpp-tests/Resources/cocosui/UITest/b1.png
	samples/cpp-tests/Resources/cocosui/UITest/b2.png
	samples/cpp-tests/Resources/cocosui/UITest/background.png
	samples/cpp-tests/Resources/cocosui/UITest/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/UITest/f1.png
	samples/cpp-tests/Resources/cocosui/UITest/f2.png
	samples/cpp-tests/Resources/cocosui/UITest/r1.png
	samples/cpp-tests/Resources/cocosui/UITest/r2.png
	samples/cpp-tests/Resources/cocosui/UITest/ribbon.png
	samples/cpp-tests/Resources/cocosui/animationbuttonnormal.png
	samples/cpp-tests/Resources/cocosui/animationbuttonpressed.png
	samples/cpp-tests/Resources/cocosui/arrow.png
	samples/cpp-tests/Resources/cocosui/b11.png
	samples/cpp-tests/Resources/cocosui/backtotopnormal.png
	samples/cpp-tests/Resources/cocosui/backtotoppressed.png
	samples/cpp-tests/Resources/cocosui/bitmapFontTest2.fnt
	samples/cpp-tests/Resources/cocosui/bitmapFontTest2.png
	samples/cpp-tests/Resources/cocosui/button.png
	samples/cpp-tests/Resources/cocosui/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosui/ccicon.png
	samples/cpp-tests/Resources/cocosui/check_box_active.png
	samples/cpp-tests/Resources/cocosui/check_box_active_disable.png
	samples/cpp-tests/Resources/cocosui/check_box_active_press.png
	samples/cpp-tests/Resources/cocosui/check_box_normal.png
	samples/cpp-tests/Resources/cocosui/check_box_normal_disable.png
	samples/cpp-tests/Resources/cocosui/check_box_normal_press.png
	samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_n.png
	samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_p.png
	samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_un.png
	samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1B.png
	samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1a.png
	samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1c.png
	samples/cpp-tests/Resources/cocosui/examples/equip/111.png
	samples/cpp-tests/Resources/cocosui/examples/equip/12.png
	samples/cpp-tests/Resources/cocosui/examples/equip/13.png
	samples/cpp-tests/Resources/cocosui/examples/equip/14.png
	samples/cpp-tests/Resources/cocosui/examples/equip/15.png
	samples/cpp-tests/Resources/cocosui/examples/equip/2.png
	samples/cpp-tests/Resources/cocosui/examples/equip/button_end_01.png
	samples/cpp-tests/Resources/cocosui/examples/equip/button_end_02.png
	samples/cpp-tests/Resources/cocosui/examples/equip/button_green_n2.png
	samples/cpp-tests/Resources/cocosui/examples/equip/button_green_p2.png
	samples/cpp-tests/Resources/cocosui/examples/equip/button_green_un2.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/1.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/10.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/11.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/3.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/4.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/5.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/6.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/7.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/8.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/9.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/crab.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/research.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/sell.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_1.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_2.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_3.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/train.png
	samples/cpp-tests/Resources/cocosui/examples/equip/eg/upgrade.png
	samples/cpp-tests/Resources/cocosui/examples/examples.json
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/4.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/5.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/6.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_01.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_02.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
	samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
	samples/cpp-tests/Resources/cocosui/green_edit.png
	samples/cpp-tests/Resources/cocosui/grossini-aliases.png
	samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
	samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/UIAction_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/5.png
	samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/7.png
	samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/button.png
	samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buttonHighlighted.png
	samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buy_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/111.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/12.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/13.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/14.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/15.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_01.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_02.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_n2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_p2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_un2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/1.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/10.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/11.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/3.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/4.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/5.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/6.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/7.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/8.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/9.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/crab.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/research.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/sell.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_1.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_3.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/train.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/upgrade.png
	samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/map_1/image_castle.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_pve.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/5.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/7.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_02.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_03.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_04.png
	samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/map_alert_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/background.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/buttonBackground.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/ribbon.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
	samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/128_128.png
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.fnt
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.png
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_d.png
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_n.png
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/e-mail.png
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/register_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/register_1/ui_shop_005-hd.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
	samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
	samples/cpp-tests/Resources/cocosui/labelatlas.png
	samples/cpp-tests/Resources/cocosui/loadingbar.png
	samples/cpp-tests/Resources/cocosui/scrollviewbg.png
	samples/cpp-tests/Resources/cocosui/slidbar.png
	samples/cpp-tests/Resources/cocosui/sliderProgress.png
	samples/cpp-tests/Resources/cocosui/sliderProgress2.png
	samples/cpp-tests/Resources/cocosui/sliderThumb.png
	samples/cpp-tests/Resources/cocosui/sliderTrack.png
	samples/cpp-tests/Resources/cocosui/sliderTrack2.png
	samples/cpp-tests/Resources/cocosui/slider_bar_active_9patch.png
	samples/cpp-tests/Resources/cocosui/sliderballnormal.png
	samples/cpp-tests/Resources/cocosui/sliderballpressed.png
	samples/cpp-tests/Resources/cocosui/switch-mask.png
	templates/lua-template-runtime/res/fonts/Marker Felt.ttf
	tests/cpp-tests/Resources/cocosgui/100/100.ExportJson
	tests/cpp-tests/Resources/cocosgui/100/1000.plist
	tests/cpp-tests/Resources/cocosgui/100/1000.png
	tests/cpp-tests/Resources/cocosgui/CloseNormal.png
	tests/cpp-tests/Resources/cocosgui/CloseSelected.png
	tests/cpp-tests/Resources/cocosgui/CocoGUISample.json
	tests/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json
	tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist
	tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png
	tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson
	tests/cpp-tests/Resources/cocosgui/Hello.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
	tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
	tests/cpp-tests/Resources/cocosgui/UITest/UITest.json
	tests/cpp-tests/Resources/cocosgui/UITest/b1.png
	tests/cpp-tests/Resources/cocosgui/UITest/b2.png
	tests/cpp-tests/Resources/cocosgui/UITest/background.png
	tests/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/UITest/f1.png
	tests/cpp-tests/Resources/cocosgui/UITest/f2.png
	tests/cpp-tests/Resources/cocosgui/UITest/r1.png
	tests/cpp-tests/Resources/cocosgui/UITest/r2.png
	tests/cpp-tests/Resources/cocosgui/UITest/ribbon.png
	tests/cpp-tests/Resources/cocosgui/animationbuttonnormal.png
	tests/cpp-tests/Resources/cocosgui/animationbuttonpressed.png
	tests/cpp-tests/Resources/cocosgui/arrow.png
	tests/cpp-tests/Resources/cocosgui/b11.png
	tests/cpp-tests/Resources/cocosgui/backtotopnormal.png
	tests/cpp-tests/Resources/cocosgui/backtotoppressed.png
	tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt
	tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png
	tests/cpp-tests/Resources/cocosgui/button.png
	tests/cpp-tests/Resources/cocosgui/buttonHighlighted.png
	tests/cpp-tests/Resources/cocosgui/ccicon.png
	tests/cpp-tests/Resources/cocosgui/check_box_active.png
	tests/cpp-tests/Resources/cocosgui/check_box_active_disable.png
	tests/cpp-tests/Resources/cocosgui/check_box_active_press.png
	tests/cpp-tests/Resources/cocosgui/check_box_normal.png
	tests/cpp-tests/Resources/cocosgui/check_box_normal_disable.png
	tests/cpp-tests/Resources/cocosgui/check_box_normal_press.png
	tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png
	tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png
	tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png
	tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png
	tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png
	tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/111.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/12.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/13.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/14.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/15.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/2.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png
	tests/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png
	tests/cpp-tests/Resources/cocosgui/examples/examples.json
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
	tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
	tests/cpp-tests/Resources/cocosgui/green_edit.png
	tests/cpp-tests/Resources/cocosgui/grossini-aliases.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
	tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
	tests/cpp-tests/Resources/cocosgui/labelatlas.png
	tests/cpp-tests/Resources/cocosgui/loadingbar.png
	tests/cpp-tests/Resources/cocosgui/scrollviewbg.png
	tests/cpp-tests/Resources/cocosgui/slidbar.png
	tests/cpp-tests/Resources/cocosgui/sliderProgress.png
	tests/cpp-tests/Resources/cocosgui/sliderProgress2.png
	tests/cpp-tests/Resources/cocosgui/sliderThumb.png
	tests/cpp-tests/Resources/cocosgui/sliderTrack.png
	tests/cpp-tests/Resources/cocosgui/sliderTrack2.png
	tests/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png
	tests/cpp-tests/Resources/cocosgui/sliderballnormal.png
	tests/cpp-tests/Resources/cocosgui/sliderballpressed.png
	tests/cpp-tests/Resources/cocosgui/switch-mask.png
	tools/cocos2d-console
2014-03-12 10:09:09 +08:00
Ricardo Quesada 8f7fd3e13c Deployment iOS >= 5.1.1 (needed for ARM64)
Adds also Valid signature = iOS Developer
2014-03-11 10:18:38 -07:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00
CaiWenzhi 5e84c15812 Add RichText 2014-03-05 23:03:49 +08:00
CaiWenzhi 7a4ba91f29 Modify project file 2014-03-05 17:08:59 +08:00
Ricardo Quesada 4fe3b16287 Updates to latest version of kazmath 2014-03-04 16:33:00 -08:00
James Chen b2cebebbaf issue #4129: Remove unused references in Xcode project. 2014-02-28 15:40:03 +08:00
James Chen 801e981286 issue #4116: Updates iOS / Mac projects. 2014-02-26 22:27:38 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
samuele3hu a765178a5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-24 09:38:08 +08:00
James Chen c5bf3950bc closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm). 2014-02-21 11:55:37 +08:00
samuele3hu 555ef20202 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
Conflicts:
	cocos/scripting/lua/bindings/LuaBasicConversions.h
	cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
2014-02-21 10:10:20 +08:00
samuele3hu 3532665520 issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object 2014-02-21 09:45:33 +08:00
James Chen 0d8846d876 closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
andyque f16b0022a3 move CCActionEaseEx content to CCActionEase 2014-02-18 14:22:13 +08:00
andyque 895b2a0055 move CCActionEaseEx and CCTweenFunction to core engine 2014-02-18 14:22:12 +08:00
James Chen 297fe597e1 Updates mac / iOS project. 2014-02-18 11:08:27 +08:00
James Chen 9d764718f9 issue #4037: Removes unused files from Xcode setting. 2014-02-14 10:26:27 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
James Chen fb4699359d Merge pull request #5326 from Dhilan007/develop_label
issue #3821: Moving platform-dependent codes of LabelTTF from cocos2d::Image to cocos2d::Device.
2014-02-14 09:24:11 +08:00
Dhilan007 0d5c702708 move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
heliclei 1154c28516 share xcode build schemes to support xcodebuild command line build 2014-02-13 18:11:24 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Ricardo Quesada 1836375468 schemes are no longer shared 2014-02-12 08:26:22 +08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
Ricardo Quesada 616feadda1 More fixes and "tiles" is an uint32 (GID) 2014-02-07 18:11:17 -08:00
Ricardo Quesada 9a53f5a9f5 Testing a new TMX renderer
faster
2014-02-04 17:59:21 -08:00
Ricardo Quesada 5691829b72 Linux with #ifdef 2014-01-30 17:10:18 -08:00
Ricardo Quesada 7da8c84a75 Renames EGLView -> GLView 2014-01-30 16:51:43 -08:00
Ricardo Quesada 862500f99a Renames EGLView -> GLView 2014-01-30 15:40:56 -08:00
Ricardo Quesada b96c4f1ad0 Only compile iOS files on iOS 2014-01-27 16:44:10 -08:00
Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements
Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
2014-01-27 10:52:35 -08:00
James Chen 5b9f1697d3 closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode. 2014-01-26 11:16:25 +08:00
samuele3hu 58eab72d26 issue:Add luasocket's support for lua 2014-01-24 17:24:10 +08:00
Ricardo Quesada 8ecaf49f93 GLView improvements
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
Ricardo Quesada 83f16e25e3 merge from develop 2014-01-22 11:44:48 -08:00
Ricardo Quesada 1113587f47 mac/CCEGLView moved to desktop/ 2014-01-21 17:52:30 -08:00
Ricardo Quesada 06be466f29 Removed unused code and files.
Making the mac platform easier to mantain
2014-01-21 16:25:29 -08:00
Ricardo Quesada 98d23d30a6 First step in simplifying the mac platform 2014-01-21 15:44:01 -08:00
Dhilan007 9f9e289f8c update xcode project. 2014-01-20 11:30:35 +08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority...
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
James Chen d309ae76d0 issue #3628: Adds missing files for iOS and Mac. 2014-01-17 11:13:40 +08:00
Ricardo Quesada 65602a4574 Updates Xcode, Android and Linux project
with new BatchCommand
2014-01-15 16:06:47 -08:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
2014-01-06 23:48:47 -08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
2014-01-07 10:16:44 +08:00
Ricardo Quesada d15768d630 Removes RELASE_NOTES 2014-01-06 16:28:24 -08:00
chengstory b4118a7ccc fixed #3582
1.  add #include "cocostudio/CCComBase.h" into  CocoStudio.h
2014-01-05 03:55:10 +08:00
chengstory aae6d27c74 fixed #3582
1.  revert ComRender::create(cocos2d::Node *node, const char *comName).
2014-01-05 03:11:32 +08:00
chengstory bac600ab9f fixed #3582
1.  create Component By  component Factory.
2014-01-05 02:22:32 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
boyu0 0a06d93328 issue #3401: physical lua banding script and auto script 2014-01-02 11:45:11 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
2013-12-26 12:55:52 +08:00
CaiWenzhi 96279c12dc Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 18:32:15 +08:00
yinkaile d72c9d94d7 upload trigger code. 2013-12-25 17:40:54 +08:00
samuele3hu 45cfe00ec4 Modify iOS project set and some manual lua binding 2013-12-25 13:47:22 +08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
chengstory e4e22b52cb Merge branch 'develop' into #3456
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-12-24 22:05:13 +08:00
chengstory 64f0987fea issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +08:00
James Chen 0305ff15db Merge pull request #4625 from dabingnn/develop_NewClippingNode
Develop new clipping node
2013-12-23 23:20:38 -08:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
2013-12-23 22:55:58 -08:00
Huabing.Xu e7facf9f85 remove NewClippingNode feature function into ClippingNode 2013-12-24 14:08:57 +08:00
Huabing.Xu 24ac743a3c remove class NewSpriteBatchNode 2013-12-24 11:03:59 +08:00
CaiWenzhi 6dd55921aa Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-24 10:44:57 +08:00
Huabing.Xu 8d58e43ad2 remove Class NewSprite 2013-12-24 09:40:00 +08:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
Huabing.Xu 1dd2c1c20c remove NewTextureAtlas 2013-12-23 20:11:50 +08:00
Huabing.Xu 487e0b21af update Xcode project file& android.mk 2013-12-23 18:03:08 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
Ricardo Quesada fd8c7e9a5d Removes CCCamera
Not needed anymore.
2013-12-20 19:24:56 -08:00
James Chen 0db2067f97 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine 2013-12-20 20:11:41 +08:00
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
Huabing.Xu d51ad36613 Merge branch 'develop' into develop_gridNode
* develop: (67 commits)
  Adds const in ShaderTest2.h
  Skew works again!
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Reverts submodule.
  Updates submodule of bindings-generator.
  Adds `std::for_each` test in invocation
  Reverts bindings-generator.
  fixed not render
  iterator in Sprite fixes
  update vs project for removes unneeded files
  getNodeToParentTransform fixes
  Node cleanup
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Improves SpriteTest
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Android and Linux fixes
  removes `using namespace std` from header file
  Removes unneeded files
  change play arguments
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
byeonggee.seo e673bd80bb new spine runtime applied 2013-12-19 10:50:37 +09:00
Ricardo Quesada 903844c7bd Removes unneeded files
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
James Chen d3a4dbab08 iOS & Mac project fix. 2013-12-17 16:34:05 +08:00
James Chen 5d248ef77a issue #2171: Reorder renderer files for iOS & mac project. 2013-12-17 15:40:17 +08:00
Huabing.Xu 6aa2908c13 rename:
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid  getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
2013-12-16 14:21:05 +08:00
Huabing.Xu 2be1a640fa update Xcode project file 2013-12-13 10:58:31 +08:00
Ricardo Quesada 3b66d09bf5 Merge branch 'develop' into newRenderer 2013-12-10 11:10:55 -08:00
Ricardo Quesada aa00137fde Merge branch 'develop' into newRenderer 2013-12-09 11:10:00 -08:00
James Chen 8b69994d5c issue #2790: Removes CCBValue. 2013-12-09 17:55:56 +08:00
James Chen d8061477c1 issue #2790: Removes CCSort.h/.cpp from projects. 2013-12-07 14:21:01 +08:00
Ricardo Quesada 97fb43b8d7 Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
Ricardo Quesada dcf4eacd92 update project 2013-12-05 22:24:51 -08:00
Ricardo Quesada e699a3b765 Uses MV in Quad Command 2013-12-05 19:04:01 -08:00
Nite Luo 42de943662 Fix Bug for Sprite performance test 2013-12-05 14:25:45 -08:00
Ricardo Quesada f68dcd9969 Merge branch 'develop' into newRenderer
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
James Chen b0af2667f8 Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
Conflicts:
	cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
minggo ba62c88682 Merge pull request #4420 from dumganhar/iss2790-template-container
[ci skip]issue #2790: (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
2013-12-04 20:06:24 -08:00
Ricardo Quesada f42aef0af8 Moves CCConsole.* to base/ 2013-12-04 18:09:23 -08:00
James Chen 3649530f97 issue #2790: Moves CCValue.h/.cpp to base folder. 2013-12-04 16:02:54 +08:00
James Chen 3136ffc3dd issue #2790: Adds CCValue.h/.cpp. 2013-12-04 16:02:51 +08:00
James Chen d2bddee11e issue #2790: Adds CCMap.h. 2013-12-04 16:01:56 +08:00
James Chen 80004548c8 issue #2790: Adds CCVector.h to Xcode project. int —> long 2013-12-04 15:56:08 +08:00
boyu0 98779b0a9f issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
Nite Luo 6862d59bb2 Add NewRenderTexture to convert RenderTexture to use new renderer 2013-12-02 17:23:52 -08:00
Nite Luo fbadb3329a Merge branch 'develop' into newRenderer
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00
Ricardo Quesada dbcae0af1e Merge branch 'develop' into console 2013-12-02 09:57:53 -08:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +08:00
boyu0 72f2d68edd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-27 17:47:37 +08:00
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
Huabing.Xu ea46e1c658 change test case 2013-11-27 14:30:38 +08:00
Ricardo Quesada 534fd9600e Adds CCConsole.
it doesn't work... just the skeleton
2013-11-26 18:58:36 -08:00
Huabing.Xu 3da196ea43 add Frustum culling to new Sprite 2013-11-27 10:35:12 +08:00
boyu0 99d904363a issue #2771: delete all the box2d implementation in physics parts. 2013-11-26 13:47:42 +08:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
boyu0 f2dabe77ec issue #2771: add some method implements with box2d in PhysicsWorld 2013-11-25 10:08:52 +08:00
Nite Luo b67ec6618f Finish converting LayerColor start working on particle system 2013-11-22 17:14:24 -08:00
Nite Luo f438e83104 Merge branch 'develop' into newRenderer 2013-11-20 11:14:28 -08:00
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
2013-11-19 16:57:23 -08:00
Nite Luo e5ebcb2845 Merge branch 'develop' into newRenderer 2013-11-18 10:22:16 -08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
Nite Luo 566767da60 Add NewDrawNode 2013-11-15 11:29:11 -08:00
Nite Luo a70cad8c97 Merge branch 'develop' into newRenderer 2013-11-14 10:36:43 -08:00
Nite Luo 4f1858fa8a Crate NewClipping Node 2013-11-14 10:35:28 -08:00
Nite Luo f17af1f319 Add group command 2013-11-13 17:31:12 -08:00
Nite Luo ab8b61aaec Create NewSpriteBatchNode to use NewRender 2013-11-12 11:18:49 -08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
Nite Luo a28f3f6f03 Merge branch 'develop' into newRenderer 2013-11-11 12:04:28 -08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
Nite Luo fa9d8fe077 Add CustomCommand 2013-11-08 12:06:39 -08:00
Nite Luo be71eb8626 Merge branch 'develop' into newRenderer
Conflicts:
	.gitignore
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/2d/CCDirector.cpp
2013-11-07 17:24:57 -08:00
samuele3 16d572c04f issue #2868:Add manual lua binding files 2013-11-07 23:22:11 +08:00
Nite Luo 3108d499e5 use placeholder logic to generate material id 2013-11-06 14:24:56 -08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
Conflicts:
	cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
samuele3 b9e5d4bc91 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 17:37:54 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
Ricardo Quesada 2f0a19c7a3 Enables more warnings in Xcode project 2013-11-04 16:30:00 -08:00
Ricardo Quesada ab6d620b3d Disables arm64 for the moment 2013-11-04 15:11:20 -08:00
Ricardo Quesada 8fb5fad20d Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
Nite Luo e4ffd250cb Simple implementation of RenderCommand and RenderQueue 2013-11-04 09:14:22 -08:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
2013-11-01 02:33:28 -07:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
2013-10-31 21:57:24 +08:00
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
boyu0 2efef34144 issue #2771: fix vs compile errors 2013-10-31 18:18:02 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
James Chen b4eb970589 [JSB] Fixing compilation errors for iOS and Mac projects. 2013-10-25 10:50:03 +08:00
samuelhu 0cffe51219 fix libluajia.a search path bug 2013-10-18 18:08:05 +08:00
samuelhu 4ccb13f5d0 fix libluajia.a search path bug 2013-10-18 17:37:04 +08:00
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
Ricardo Quesada 28de91d965 more Xcode fixes 2013-10-16 11:45:58 -07:00
James Chen b5233fc18d issue #2905: [iOS Mac] Updating project configurations. 2013-10-16 17:27:30 +08:00
James Chen 225738ecc5 issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen 039a2c93e1 issue #2905: [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file. 2013-10-16 11:30:56 +08:00
James Chen 65f33461bc issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now. 2013-10-16 11:19:42 +08:00
Ricardo Quesada 8cad67a3e1 small fixes for the Xcode projects 2013-10-15 13:36:03 -07:00
James Chen 16c88363f5 issue #2905: Updating project configuration for SimpleGame. 2013-10-14 17:16:39 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00