1034 Commits

Author	SHA1	Message	Date
andyque	f5795c25b6	remove warnings under win32	2014-03-24 10:12:40 +08:00
Dale Stammen	ea9fb140fa	no mp3 support for wp8	2014-03-22 06:13:02 -07:00
Dale Stammen	b50a158b62	need to terminate variable args list with NULL. nullptr will not work with wp8 compiler	2014-03-22 06:04:36 -07:00
James Chen	177bf4df9d	Some warning fixes.	2014-03-14 15:38:43 +08:00
CaiWenzhi	4d99736e4a	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-12 17:06:48 +08:00
James Chen	176a9b5fe6	Some warning fixes in TriggerMng.cpp and TriggerObj.cpp	2014-03-12 14:07:34 +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
CaiWenzhi	f2c483876a	Fixed bug of guireader	2014-03-12 10:07:55 +08:00
chengstory	59aa17ea05	Change && to || in conditions judge.	2014-03-11 22:02:55 +08:00
andyque	48772fb952	modify android makefile	2014-03-11 18:48:28 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00
Geron	09c6d196a2	Merge pull request #1 from 2youyouo2/develop ... merge kaile	2014-03-11 12:37:55 +08:00
geron-cn	9083de94b4	repair bug: changedisplay(armature,i>=0) does not reblind parentbone	2014-03-11 10:21:43 +08:00
CaiWenzhi	26b3013f77	Format codes	2014-03-10 15:08:42 +08:00
CaiWenzhi	80d97bb107	Modify action	2014-03-07 21:49:24 +08:00
CaiWenzhi	5ee35be0ad	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-07 14:41:32 +08:00
James Chen	49223fe50c	Compilation error fixes for linux port (clang compiler).	2014-03-07 13:52:54 +08:00
CaiWenzhi	51a6eb6d64	Fixed bug of Action Manger Ex	2014-03-07 12:01:51 +08:00
CaiWenzhi	b4466fab12	Fixed bug of action manager	2014-03-07 11:58:54 +08:00
CaiWenzhi	7cdfba088d	Modify reader	2014-03-07 10:35:58 +08:00
CaiWenzhi	bd5c11b5ee	Modify mk file and solve warnings	2014-03-06 16:15:03 +08:00
CaiWenzhi	3554dcd749	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-06 11:22:33 +08:00
Ricardo Quesada	a0ab8fcdf3	onDraw() updated ... `onDraw()` receives `const kmMat4 &transform` and `bool transformUpdated`. `CC_NODE_DRAW_SETUP()` is no longer used in our code. `_modelViewTransform` is only used as a cache.	2014-03-05 15:49:08 -08:00
CaiWenzhi	cb5f9ad6dc	Modify windows project	2014-03-05 22:34:24 +08:00
CaiWenzhi	4f9dfdbef8	Fixed build error except Windows	2014-03-05 21:18:51 +08:00
CaiWenzhi	7a4ba91f29	Modify project file	2014-03-05 17:08:59 +08:00
CaiWenzhi	ab47cafb31	Merge branch 'develop' into develop_nutty_modify_framework_for315 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/gui/UIButton.cpp cocos/gui/UIButton.h cocos/gui/UIWidget.h	2014-03-05 16:52:31 +08:00
James Chen	8e28400725	Some warning fixes in cpp-tests.	2014-03-05 15:04:47 +08:00
CaiWenzhi	5108d276b6	Modify trigger	2014-03-04 23:55:36 +08:00
CaiWenzhi	8b9d572961	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-04 16:59:06 +08:00
CaiWenzhi	4a2dc4a607	Add custom widget and reader	2014-03-04 16:51:35 +08:00
Ricardo Quesada	c386f88e32	Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h	2014-03-03 11:27:42 -08:00
minggo	d207670011	Merge pull request #5501 from nutty898/develop_nutty_modify_framework_for315 ... Develop nutty modify framework for315	2014-03-03 18:09:32 +08:00
yinkaile	8f1ba73a52	fixed add ParticleSystem display crashed	2014-03-03 14:56:56 +08:00
CaiWenzhi	23a51c7c84	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-03 13:45:53 +08:00
James Chen	757425c54b	issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.	2014-03-03 11:00:30 +08:00
cai wenzhi	683d3c9f14	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-02 19:28:44 +08:00
Ricardo Quesada	cdc19eea1c	Nodes: setAdditionalTransform() receives a pointer ... and not a const reference. If the pointer is `NULL`, then it won't use the additionalTransform	2014-03-01 08:26:54 -08:00
Ricardo Quesada	d78304599d	Cache working OK. ... Performance increased in 20% for static objects.	2014-02-28 16:10:48 -08:00
Ricardo Quesada	6920bec6ef	transform object returns the MV ... code cleaner. the kmGL code is altogether	2014-02-28 11:20:53 -08:00
Ricardo Quesada	eb66ddd931	visit and draw improved. ... `visit()` and `draw()` are improved. they both receive: - `Renderer` - `kmMat4` for transformation - `bool` whether or not the transform changed from the previous frame Although `draw` and `visit` are not using the 3 new parameters, they will start using it in the coming days (or weeks, or months). Those parameters are needed for: - `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer - we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that. - whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that. We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.	2014-02-27 21:43:54 -08:00
andyque	bf81591b48	fixed #3829. change namespace gui to ui	2014-02-25 10:18:44 +08:00
Ricardo Quesada	fe1160cd8c	changes in API to support 3D	2014-02-22 19:16:42 -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	4cf4e15ba6	issue #4058: Adds CCStdC.h.	2014-02-20 15:12:35 +08:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
andyque	143f5975a6	fix cross-platform comiple error ... details: remove CCActionEaseEx dependency fix compile errors on android platform fix a few inproper decalare fix linux compile error fix win32 compile error	2014-02-18 14:22:15 +08:00
andyque	68b1c9f2c1	change CCTweenFunction class to tweenfunc namespace	2014-02-18 14:22:13 +08:00
andyque	838c71b135	refactor EaseIn with CCTweenFunction	2014-02-18 14:22:13 +08:00
andyque	ab11147eeb	rename namespace of CCTweenFunction to cocos2d and fix some compile errors	2014-02-18 14:22:13 +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	f67f324378	Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289 ... Conflicts: cocos/2d/platform/win32/CCImage.cpp	2014-02-17 22:10:45 +08:00
Denis	deb4666e27	-fixed formating and small optimizations	2014-02-13 11:39:53 +03:00
CaiWenzhi	c1cfa1cce2	Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone	2014-02-07 11:26:46 +08:00
Maks	72ede55ac7	fix string size check and assert condition ... 1. std::string::size() return size_t (is never < 0) 2. "event must be larger than 0" and 'event' has unsigned int type	2014-02-03 22:12:03 +02:00
James Chen	c6e7093270	closed #3833: SceneTest of CocoStudio crashes	2014-01-24 11:50:58 +08:00
andyque	43ff0c42cf	fix a potential bug of CCSkin. It will cause the display of CCSkin wrongly.	2014-01-24 11:05:34 +08:00
minggo	4381685a9d	deprecated some functions in Object	2014-01-22 13:47:29 +08:00
CaiWenzhi	a3f9a636e2	Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone	2014-01-20 11:54:11 +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
Ricardo Quesada	8931d968c0	Renderer uses a float as a key ... Instead of using a 64-bit int key with viewport, opaque and depth, it only uses a 32-bit float with only the depth. Saves time in: - No need to convert the 32-bit float into 24-bit int - keys are shorter	2014-01-17 16:08:29 -08:00
CaiWenzhi	58ed383c01	Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone	2014-01-17 14:12:19 +08:00
Ricardo Quesada	1b5b9da102	compiles on Android ... compiles on Android	2014-01-16 21:58:14 -08:00
Ricardo Quesada	cfbceb0e22	Fixes compilation issues on Linux	2014-01-16 21:49:14 -08:00
Ricardo Quesada	d0dbf34319	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
CaiWenzhi	602133a071	Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs	2014-01-17 11:25:38 +08:00
andyque	4a6e137389	fixed #3683. fixed convertToWorldSpaceAR of CCSkin returning error coordinate	2014-01-16 15:00:35 +08:00
CaiWenzhi	fdf5a4c0b5	Fixed bug of reader.	2014-01-15 20:06:49 +08:00
CaiWenzhi	fdfa84ce20	Fixed bugs.	2014-01-14 14:37:31 +08:00
CaiWenzhi	4e2d6143af	Fixed bug of reader	2014-01-10 17:02:16 +08:00
James Chen	c7639319ee	Fix Armature::init() crashes	2014-01-07 20:53:44 +08:00
James Chen	e90f35daa6	Merge pull request #4975 from chengstory/fix_UIAction_play_error ... fixed UIAction play error.	2014-01-07 03:17:41 -08:00
zhangcheng	bf8187fee2	fixed UIAction play error.	2014-01-07 19:04:18 +08:00
James Chen	26efb4bf5c	long —> ssize_t for some classes.	2014-01-07 18:26:31 +08:00
edwardzhou	e1c21aa9cb	rename UIHelper to Helper for consistency	2014-01-07 16:22:18 +08:00
James Chen	2a3481f20c	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
chengstory	e44d28ea7b	replace CC_SAFE_RELEASE to CC_SAFE_RELEASE_NULL	2014-01-06 13:27:19 +08:00
chengstory	76f96d0b41	fixed ActionNode memoryleak.	2014-01-06 10:42:17 +08:00
chengstory	877c6dddf3	fixed ＃3582 ... 1. CCScene -> Scene.	2014-01-05 13:16:23 +08:00
chengstory	bd9dc274f8	fixed #3482 ... 1. add override to virtual functions. 2. replace std::string::npos to filePath.npos. 3. replace std::string to const std::string& .	2014-01-05 12:42:39 +08:00
chengstory	10fec47b04	fixed #3582 update libCocoStudio windows project.	2014-01-05 11:38:01 +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
James Chen	17be52740a	Removes duplicated file in Android.mk	2014-01-04 16:57:46 +08:00
James Chen	284d845f2f	Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795	2014-01-04 16:55:40 +08:00
James Chen	4c3fa3da49	Merge pull request #4865 from dumganhar/testjs-bugfix ... Some fixes for TestJavascript	2014-01-03 23:34:08 -08:00
James Chen	98265e7961	Reverts GUIReader definition. it should be inherited from Object to make bindings happy.	2014-01-04 15:17:36 +08:00
James Chen	ef5ab1b9be	sharedXXX -> getInstance, purgeXXX -> destroyInstance.	2014-01-04 14:23:40 +08:00
James Chen	98346474b8	Merge pull request #4863 from Dhilan007/develop_crash ... fix compiling error and miss file on vs.	2014-01-03 20:41:19 -08:00
Dhilan007	35246b0810	fix compiling error and miss file on vs.	2014-01-04 12:25:12 +08:00
James Chen	322cf0d233	Fixing CocoStudio bindings error.	2014-01-04 12:11:10 +08:00
James Chen	55e45d44c4	Merge pull request #4810 from chengstory/#3480 ... Update SceneReaderTest Samples	2014-01-03 19:49:28 -08:00
James Chen	46153d8c34	More warning fixes.	2014-01-04 09:17:37 +08:00
chengstory	46c7338008	fixed #3480 ... 1. remove unused getnode and setnode interface. 2. add condition test. 3. Modify ComAttribute to support for parse json file. 4. Replace scenereader callback function to C++ 11 implement.	2014-01-03 19:30:47 +08:00
chengstory	e08e4ce0f8	fixed #3480 add search paths.	2014-01-03 02:21:36 +08:00
chengstory	77dca5958f	issue #3480 upload Samples resources.	2014-01-03 02:03:05 +08:00
chengstory	5903a74bd2	issue #3480 ... 1. add getNode and setNode class function to Component. 2. fixes some build error.	2014-01-03 01:42:14 +08:00
chengstory	6892d8cf6a	issue #3480 ... 1. add SceneReader Tests. 2. Modify class member name.	2014-01-03 01:14:12 +08:00
Liam	dd0b22be8d	resolved ui animation easing error for develop branch	2014-01-02 17:18:40 +08:00
Liam	ef76edbd1c	merge from develop branch	2014-01-02 17:02:55 +08:00
yinkaile	1f38fc28a6	change interface	2014-01-02 11:07:31 +08:00
CaiWenzhi	81bdfac795	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
James Chen	edb2ad0933	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding ... Conflicts: cocos/editor-support/cocostudio/TriggerMng.cpp	2013-12-30 21:06:57 +08:00
James Chen	1edf748dc3	[JSB] Adds trigger bindings for CocoStudio.	2013-12-30 20:57:46 +08:00
chengstory	0488aa6dcb	fixed #3474 ... 1. Modify CCLOG, Add classname. 2. change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack. 3. remove unused do while(0).	2013-12-30 15:26:51 +08:00
minggo	0e9b43248c	Merge pull request #4728 from dabingnn/develop_removeCommandPool ... Develop remove command pool	2013-12-29 21:53:12 -08:00
James Chen	b17117a1a1	More warning fixes.	2013-12-28 14:34:52 +08:00
James Chen	f4825ec94a	Bug fixes for cocostudio.	2013-12-27 20:54:05 +08:00
James Chen	b03c8259b1	Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test ... Conflicts: cocos/scripting/auto-generated	2013-12-27 20:18:58 +08:00
minggo	0690305398	Merge pull request #4666 from 2youyouo2/develop ... change play interface name	2013-12-27 01:50:08 -08:00
chengstory	faaf6d3f2b	fixed #3457 fixes some bug.	2013-12-27 17:21:13 +08:00
Huabing.Xu	66e550e5a0	Merge branch 'develop' into develop_removeCommandPool ... * develop: (33 commits) fix black screen when back to foreground on android. Fix set FPS broken. Update CHANGELOG [ci skip] Update AUTHORS [ci skip] Update CCString.cpp [AUTO] : updating submodule reference to latest autogenerated bindings Updates Bindings-generator. Renames: IntValueMap —> ValueMapIntKey Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`. Modify reader long --> ssize_t for TableView callback. Generates execute file in cocos root_dir/bin folder for HelloCpp. Add listview and pageview reader [AUTO] : updating submodule reference to latest autogenerated bindings Modify actionnode [AUTO] : updating submodule reference to latest autogenerated bindings optimize loop fix LabelTestNew Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669 Fix box2dView ...	2013-12-27 14:07:04 +08:00
chengstory	4cb227ae0d	fixed #3457 ui action can not play.	2013-12-27 12:45:05 +08:00
zhangcheng	dd4339b0bb	Merge branch '#3457' of git://github.com/chengstory/cocos2d-x into #3457	2013-12-27 12:41:01 +08:00
zhangcheng	1b666d4d41	fixed #3457 scenetest crashed when back to menu.	2013-12-27 12:39:21 +08:00
Liam	0cdf2d15fe	merge from develop branch	2013-12-27 10:50:50 +08:00
Liam	2a6c24f8bf	update coco action with correct coding rule	2013-12-27 10:43:49 +08:00
zhangcheng	6a9fbfbc60	fixed #3457 update libCocosStudio.vcxproj, add trigger code.	2013-12-27 10:24:50 +08:00
chengstory	7a7d939da0	issue #3457 use C++ 11 auto loop.	2013-12-26 23:51:55 +08:00
chengstory	774e3d8536	issue #3457 ... 1. replace UIAction NULL to nullptr. 2. modify class variable name.	2013-12-26 23:40:50 +08:00
chengstory	cfbbb7889b	Merge branch 'develop' into #3457 ... Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.cpp	2013-12-26 23:01:34 +08:00
chengstory	26df681915	fixed #3457 remove jsoncpp.	2013-12-26 22:45:23 +08:00
CaiWenzhi	26a7f3474c	Modify reader	2013-12-26 21:02:47 +08:00
boyu0	d32fbbbfca	change GroupCommand variable to class member.	2013-12-26 18:11:23 +08:00
CaiWenzhi	ad535e2fcb	Add listview and pageview reader	2013-12-26 17:53:22 +08:00
chengstory	bd46681867	fixed #3457 continue to fixes failed to build.	2013-12-26 17:37:02 +08:00
chengstory	041e78cb54	Fixes failed to build android.	2013-12-26 17:17:02 +08:00
CaiWenzhi	3206727b9c	Modify actionnode	2013-12-26 17:01:31 +08:00
yinkaile	891d8c3a38	change comment	2013-12-26 16:48:19 +08:00
Liam	a158e25767	modify coco action with new coding rule	2013-12-26 16:36:21 +08:00
boyu0	2fb0179293	change QuadCommand variable to class member.	2013-12-26 16:36:03 +08:00
Liam	bc54707893	modify coco action with new coding rule	2013-12-26 16:29:59 +08:00
yinkaile	f0d4f3f9bf	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-12-26 16:19:21 +08:00
yinkaile	7027587542	fixed armature update	2013-12-26 15:49:20 +08:00
boyu0	f878864794	Specialize GroupCommand and CustomCommand, change generateCommand to new.	2013-12-26 15:41:47 +08:00
yinkaile	c096743325	change comment	2013-12-26 14:57:38 +08:00
chengstory	ab3cf064d1	fixed #4357 failed to build android.	2013-12-26 13:26:23 +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
yinkaile	b44090b40b	change std::map to std::unordered_map	2013-12-26 10:23:51 +08:00
chengstory	19d75cee01	fixed #3647 fixes ComAttribute warning.	2013-12-26 02:18:28 +08:00
chengstory	8afdf88d25	Test triiger 3.0	2013-12-26 01:17:04 +08:00
CaiWenzhi	eaef723bd7	Remove C cast	2013-12-25 22:13:19 +08:00
yinkaile	5eb961b165	fixed warning	2013-12-25 19:46:09 +08:00
yinkaile	d72c9d94d7	upload trigger code.	2013-12-25 17:40:54 +08:00
yinkaile	13408e4dc5	change play interface name	2013-12-25 16:46:31 +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
zhangcheng	2c6f95ecea	issue #3456 replace jsoncpp to rapidjson.	2013-12-24 20:33:55 +08:00
CaiWenzhi	0dac69523c	Remove "_renderer" from widget	2013-12-24 20:22:14 +08:00
zhangcheng	5214965e4f	fixed #3456	2013-12-24 18:33:19 +08:00
James Chen	0ff85852cc	Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.	2013-12-24 18:08:40 +08:00
Liam	c6fb3b7e0d	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop	2013-12-24 15:32:09 +08:00
yinkaile	67c3480320	change std::string.compare() to ==	2013-12-24 14:21:25 +08:00
yinkaile	44e22584a4	fixed getFileData	2013-12-24 13:35:46 +08:00
yinkaile	ff053e71fe	change std::string compare method	2013-12-24 11:05:53 +08:00
CaiWenzhi	3885477276	Remove CCDictionary from GUIReader	2013-12-24 10:41:01 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
yinkaile	ba809a0096	change const char* to const std::string&	2013-12-23 14:05:46 +08:00
yinkaile	4f003da8cb	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-12-20 10:53:37 +08:00
James Chen	e56a4a7c00	Merge pull request #4567 from dumganhar/for_each-gone ... All std::for_each has gone. uses for(const auto& ...) instead.	2013-12-19 18:50:50 -08:00
minggo	756f8f7a11	Merge pull request #4482 from dabingnn/develop_gridNode ... Develop grid node	2013-12-19 18:30:42 -08:00
James Chen	34382b4a8a	More std::for_each —> for(const auto& …)	2013-12-20 09:54:50 +08:00
Ricardo Quesada	59fee6b8d2	replaces std::for_each with for() ... replaces `std::for_each` with C++11 `for( : )`	2013-12-19 13:34:41 -08:00
Ricardo Quesada	99ae4d86d3	fixes compiler warnings ... * converts some `int` to `ssize_t` * adds `const` to `title()` and `subtitle()`	2013-12-19 12:23:42 -08:00
yinkaile	c58963bd45	add support for tweenRotate property	2013-12-19 21:12:25 +08:00
James Chen	ec0bdf06af	Merge pull request #4555 from 2youyouo2/develop ... fixed armature position not right	2013-12-19 05:05:25 -08:00
yinkaile	b367896f94	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-12-19 20:50:27 +08: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
boyu0	ef54ed3c15	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD ... Conflicts: cocos/2d/CCLabel.cpp cocos/2d/CCLabel.h cocos/2d/CCLabelBMFont.cpp cocos/2d/CCLabelBMFont.h cocos/2d/CCLayer.cpp cocos/2d/CCLayer.h cocos/2d/CCNode.cpp extensions/GUI/CCControlExtension/CCControl.cpp extensions/GUI/CCControlExtension/CCControlButton.cpp extensions/GUI/CCControlExtension/CCScale9Sprite.cpp tools/tojs/cocos2dx.ini	2013-12-19 17:05:59 +08:00
yinkaile	140bd2ecad	fixed armature position not right	2013-12-19 15:43:32 +08:00
James Chen	75b5edb66c	Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test	2013-12-19 11:16:03 +08:00
yinkaile	a6a432d2a2	fixed not render	2013-12-19 10:42:06 +08:00
Ricardo Quesada	89701f5006	getNodeToParentTransform fixes ... Code is cleaner. `Armature` calls parent to reduce code. []: Skew is still not working properly	2013-12-18 18:00:55 -08:00
yinkaile	93eaf44e9c	Merge branch 'develop' into Array ... Conflicts: cocos/scripting/auto-generated	2013-12-19 09:42:21 +08:00
Ricardo Quesada	8390e7eadb	Node cleanup ... Uses "normal" interation without the lambda to prevent another object in the stack. removed unused code.	2013-12-18 16:56:59 -08:00
Ricardo Quesada	d1b555614e	removes `using namespace std` from header file ... ... in order to prevent possible collisions. `using namespace XXX` MUST never be used in header files.	2013-12-18 11:45:30 -08:00
yinkaile	324732b867	change play arguments	2013-12-18 23:29:54 +08:00
yinkaile	7be834ea37	change play arguments	2013-12-18 22:57:18 +08:00
yinkaile	57c33e0604	fixed compile error	2013-12-18 22:36:10 +08:00
yinkaile	d3a575e8cc	change for iterator and callfunc	2013-12-18 22:07:33 +08:00
yinkaile	026811ca59	Merge branch 'develop' into Array ... Conflicts: cocos/scripting/auto-generated tools/bindings-generator	2013-12-18 22:03:16 +08:00
Ricardo Quesada	33c4f891a0	Adds 'CC' to renderer files	2013-12-17 18:41:09 -08:00
Ricardo Quesada	d6be81b7a8	The Renderer is not a singleton ... In order to access, you have to get it from the Director `Director::getInstance()->getRenderer()`	2013-12-17 17:50:17 -08:00
Ricardo Quesada	10eafeaeed	fixes warning compiler	2013-12-17 11:16:30 -08:00
yinkaile	581a7856de	fixed compiler error	2013-12-17 19:32:16 +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
yinkaile	6ff45b09e7	Merge branch 'newRenderer' into Array ... Conflicts: cocos/editor-support/cocostudio/CCArmature.cpp cocos/editor-support/cocostudio/CCArmature.h cocos/editor-support/cocostudio/CCBatchNode.cpp cocos/editor-support/cocostudio/CCColliderDetector.cpp cocos/scripting/auto-generated tools/bindings-generator	2013-12-17 18:06:11 +08:00
James Chen	c0d741d0d8	Merge pull request #4507 from dumganhar/del-vector-foreach ... Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.	2013-12-17 01:55:35 -08:00
James Chen	d16fa07661	Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.	2013-12-17 17:45:29 +08:00
minggo	bcb07abb7b	Merge pull request #4505 from 2youyouo2/newRenderer ... update armature to new render	2013-12-17 01:43:07 -08:00
yinkaile	bc868cc004	update armature to new render	2013-12-17 17:00:01 +08:00
James Chen	12cc6c6153	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt	2013-12-17 15:50:24 +08:00
minggo	16ed9155c0	Merge pull request #4460 from Dhilan007/label_distanceField ... new label:add support for distanceField	2013-12-16 23:18:41 -08:00
James Chen	2a38d4fe94	issue #2171: Fixing compilation errors for Linux port.	2013-12-17 14:50:40 +08:00
Liam	3c26106ffb	update ui animation with frame ease type	2013-12-16 18:13:49 +08:00
youyou	81cdbea9c8	change Array to Vector, Dictionary to Map	2013-12-16 14:34:09 +08:00
Huabing.Xu	b1eacd52cb	Merge branch 'develop' into develop_gridNode ... * develop: fix compile error related to ssize_t. issue #2771: add and change some physics API, and add more documents [AUTO] : updating submodule reference to latest autogenerated bindings Some fixes for XXX:getDescription. Reverts CCSpriteBatchNode.h size_t —> ssize_t in CCTMXLayer.cpp issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define [AUTO] : updating submodule reference to latest autogenerated bindings More renames of description() to getDescription() getDescription() works as expected fix compiling error after fixing conflicts fix compiling error after fixing conflicts use ssize_t for index use ssize_t for index and capacity use ssize_t for capacity and index in containers Fix:Remove some needless lua binding functions and resolve a bug	2013-12-16 10:43:49 +08:00
Ricardo Quesada	3838268fd0	Merge branch 'develop' into newRenderer	2013-12-14 19:28:01 -08:00
youyou	917bd8c3d9	change Array to Vector	2013-12-13 19:40:38 +08:00
boyu0	defae416f3	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect	2013-12-13 18:09:39 +08:00
youyou	0e8c3409e5	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h	2013-12-13 16:28:50 +08:00
youyou	6a3aff0861	fixed change animation internal, animation speed not right	2013-12-13 15:58:58 +08:00
youyou	1bdf1a44a1	1.change blendfunc method ... 2.support custom easing	2013-12-13 15:02:09 +08:00
Dhilan007	39280d55f3	new label:add support for distanceField ... PerformanceTest:add performance test for label.	2013-12-13 12:42:15 +08:00
Ricardo Quesada	29a15c885a	Merge branch 'develop' into newRenderer	2013-12-12 11:44:09 -08:00
boyu0	d7106d49be	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect	2013-12-12 17:04:21 +08:00
Huabing.Xu	5509bd48ef	remove _grid	2013-12-12 16:21:21 +08:00
minggo	16efe94946	fix compiling error after fixing conflicts	2013-12-12 14:48:27 +08:00
Ricardo Quesada	6d1abc7d4d	Merge branch 'develop' into newRenderer	2013-12-11 15:28:05 -08:00
James Chen	cc567a3077	issue #2790: Vector::remove —> Vector::erase.	2013-12-11 18:08:06 +08:00
boyu0	7cbce905bf	issue #3162: delete duplicate functions.	2013-12-11 16:12:14 +08:00
Ricardo Quesada	23222923bf	Migrated code to Matrix4	2013-12-10 11:07:15 -08:00
Dhilan007	abef5b59fa	fix compile error for vs project	2013-12-10 21:20:52 +08:00
youyou	a884a70045	fix2d compling warning	2013-12-09 13:56:07 +08:00
youyou	c96bc7b58d	fix collider Synchronization	2013-12-09 11:14:53 +08:00
boyu0	4d0e3dbd8d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect	2013-12-06 18:16:26 +08:00
boyu0	af5f496861	issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.	2013-12-06 18:07:16 +08:00
youyou	e17b9d839b	1.add TEST_EASING ... 2.add play serveral movement function 3.update TEST_COLLIDER_DETECTOR 4.fixed movement event	2013-12-06 13:40:49 +08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
James Chen	499a0404d4	issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector.	2013-12-05 10:35:10 +08:00
James Chen	9928e8bef1	issue #2790: Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.	2013-12-04 16:01:55 +08:00
James Chen	1d5984b29a	issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach	2013-12-04 16:01:02 +08:00
James Chen	d4d864216b	issue #2790: Deletes Vector::init, adds Vector::setCapacity.	2013-12-04 16:00:18 +08:00
James Chen	90062b656d	issue #2790: Node::_children is Vector<Node*> now.	2013-12-04 16:00:17 +08:00
James Chen	c152652c5b	issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).	2013-12-04 15:56:08 +08:00
2youyou2	963dd6852b	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop	2013-12-02 13:33:26 +08:00
2youyou2	246b03d52d	fixed alpha effect	2013-12-02 13:32:31 +08:00
minggo	eded94ef76	don't create a pool, since it doesn't invoke any iOS dependent codes	2013-11-27 17:43:54 +08:00
minggo	bcb131262c	add helper funcion to invoke a function in gl thread	2013-11-27 16:49:07 +08:00
2youyou2	36cd51a453	change ColliderFilter param type	2013-11-27 11:39:58 +08:00
2youyou2	c0bd7f012c	change ColliderFilter param type	2013-11-27 11:32:37 +08:00
2youyou2	9cfb7b2a85	change armature version	2013-11-25 14:46:10 +08:00
Ricardo Quesada	a26b385b11	Merge branch 'develop' into constructors_are_protected	2013-11-21 10:56:03 -08:00
samuele3	07ea8647c3	Add doxygen comments for the CocoStudio	2013-11-20 15:07:34 +08:00
samuele3	8a408f9951	Add doxygen comments for the CocoStudio	2013-11-20 12:04:47 +08:00
Ricardo Quesada	5c74c938ee	Merge branch 'develop' into constructors_are_protected ... Conflicts: cocos/2d/CCLayer.h	2013-11-19 13:13:57 -08:00
2youyou2	d5478f1ca2	fix if last frame has tween effect, armature may display wrong	2013-11-19 11:44:17 +08:00
yinkaile	f308f2f95a	fix CCArmature display wrong on mac version	2013-11-19 11:22:40 +08:00
Ricardo Quesada	c943702bc8	Merge branch 'develop' into constructors_are_protected ... Conflicts: cocos/editor-support/cocostudio/CCActionObject.cpp samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h	2013-11-18 11:07:15 -08:00
Liam	c7932b6181	fixed ui anmation crash when stop animation	2013-11-19 00:57:22 +08:00
minggo	1ed8cfee7c	Merge pull request #4297 from liamcindy/develop ... [ci skip]Shielded unusefull log for develop branch	2013-11-18 07:10:40 -08:00
minggo	5c41130083	Merge pull request #4293 from 2youyouo2/develop ... [ci skip]fixed BatchNode's _children is empty, draw will crash	2013-11-17 23:01:32 -08:00
Liam	66443255a6	Shielded unusefull log	2013-11-18 14:20:50 +08:00
2youyou2	4f2603f69c	fixed BatchNode's _children is empty, draw will crash	2013-11-18 13:23:38 +08:00
CaiWenzhi	2f3e922a98	Fixed crash of reader	2013-11-18 10:19:40 +08:00
minggo	db804891ed	fix some warnings	2013-11-16 20:02:49 +08:00
Ricardo Quesada	7c2ed2743c	Menu + MenuItem ... `Menu` and `MenuItem` have protected constructors	2013-11-15 13:14:12 -08:00
Huabing.Xu	e14295c404	Merge branch 'develop' into free_instead_of_delete	2013-11-15 09:45:03 +08:00
Huabing.Xu	022b5c7b9a	Merge branch 'develop' into free_instead_of_delete ... # By CaiWenzhi (4) and others # Via minggo (7) and others * develop: fix asynchronize loading bug [AUTO] : updating submodule reference to latest autogenerated bindings fixed #3185 support for html5. fixed bug of widget fixed bugs of widget fixed #3185 ComponentTest and SceneTest NULL to nullptr. Add deprecated functions of class TextureCache fix warning set z order after reorder fixed #3185 replace NULL to nullptr. add "override" fixed #3185 Modify code criterion Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSSceneReader.cpp	2013-11-15 09:44:29 +08:00
minggo	c594a673fc	Merge pull request #4244 from chengstory/#3185 ... [ci skip]fixed #3185	2013-11-14 01:33:26 -08:00
chengstory	6acf422f3b	fixed #3185 support for html5.	2013-11-14 17:03:45 +08:00
Huabing.Xu	bc55d3246b	Merge branch 'develop' into free_instead_of_delete ... # By minggo (12) and others # Via minggo (18) and others * develop: (78 commits) [AUTO] : updating submodule reference to latest autogenerated bindings Update CHANGELOG[ci skip] Update AUTHORS [ci skip] fix bug: cccolor to jsval function has error in jsb [ci skip] [ci skip] [ci skip] [ci skip] [ci skip] C++11: NULL -> nullptr [ci skip] Fix: UserDefault::createXMLFile with correct XML definition. [ci skip] [ci skip] [ci skip] Fix bug: rename const with under line seperator [AUTO] : updating submodule reference to latest autogenerated bindings Fix bug: Z fighting on TransitionScenePageTurn Fixed bugs Modify reader and fixed bugs ... Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.cpp	2013-11-14 14:47:01 +08:00
chengstory	e9f5e889d6	fixed #3185 replace NULL to nullptr.	2013-11-14 14:05:24 +08:00
chengstory	14d51f9f35	fixed #3185	2013-11-14 13:28:42 +08:00
CaiWenzhi	611ba9e9f5	Modify code criterion	2013-11-14 11:37:46 +08:00
minggo	84689e0121	Merge pull request #4206 from boyu0/iss2770_fix_warnings ... [ci skip]issue #2770: fix warnings	2013-11-13 17:57:25 -08:00
minggo	87fd45a6a4	Merge pull request #4226 from nutty898/develop_nutty_addfunctiontoguireader_3 ... [ci skip]Develop nutty addfunctiontoguireader 3	2013-11-13 17:51:35 -08:00
minggo	408ab94eba	Merge pull request #4215 from liamcindy/develop ... [ci skip]fixed ui animation play error	2013-11-13 17:47:39 -08:00
CaiWenzhi	3ac054edbd	Fixed bugs	2013-11-13 20:38:18 +08:00
CaiWenzhi	5f68e028b5	Modify reader and fixed bugs	2013-11-13 20:01:57 +08:00
boyu0	fb04c9e574	issue #2770: fix some warning	2013-11-13 11:22:34 +08:00
CaiWenzhi	0665d6c9bc	Merge branch 'develop' into develop_nutty_optimizeguireader_3	2013-11-13 10:19:09 +08:00
CaiWenzhi	03b3d583e8	Modify scenereader	2013-11-13 10:16:16 +08:00
samuele3	062fb85943	issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class	2013-11-13 10:12:44 +08:00
samuele3	f429c4c632	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-12 17:51:33 +08:00
minggo	8d79e67ecf	Merge pull request #4165 from 2youyouo2/develop ... [ci skip]update armature	2013-11-11 23:57:30 -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
samuele3	482ee5d47f	issue #2868:Add more ccs lua test samples	2013-11-12 15:25:47 +08:00
Liam	f0ca796da1	merge from develop	2013-11-12 11:20:29 +08:00
Ricardo Quesada	be64dd97cf	replaces `delete[]` with `free()` in C-based API ... API that returns a newly allocated buffer as an output argument (not return value) are error-prone. - Users forget to release the newly allocated buffer - Or the call `delete` instead of `delete[]` But some of those API need to call `realloc` on the buffer. But `realloc` is only valid if the buffer was previously allocated with `malloc`. If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead... So, this patch does: - Migrates the API from `new []` / `delete[]` to `malloc()` / `free()` - Fixes all the memory issues: incorrect deallocs and memory leaks - Updates the documentation - And fixes misc issues with the API: removes `cc` from the ZipUtils class.	2013-11-11 18:09:47 -08:00
CaiWenzhi	b688e39584	Merge branch 'develop' into develop_nutty_optimizeguireader_3	2013-11-11 18:23:21 +08:00
CaiWenzhi	4f76141c41	optimize guireader	2013-11-11 18:22:14 +08:00
2youyou2	cdae8f51bc	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop	2013-11-11 17:30:52 +08:00
2youyou2	528c257497	add setUserObject method to CCArmatureAnimation	2013-11-11 17:30:37 +08:00
minggo	1e15071dc7	remove makefiles	2013-11-11 17:29:48 +08:00
samuele3	7cfe890d5d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-11 17:04:37 +08:00
samuele3	06c7d3e96d	issue #2868:Add ccd lua test samples	2013-11-11 17:03:43 +08:00
yinkaile	677cf00355	fix compiler warning	2013-11-11 15:29:24 +08:00
yinkaile	9f67ea786e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-11-11 14:57:20 +08:00
yinkaile	0bb8714f86	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop	2013-11-11 14:53:18 +08:00
yinkaile	5ba1e4ce10	1.remove compiler wornings ... 2.change void Bone::removeFromParent(bool recursion); to void Bone::removeFromParent();	2013-11-11 14:50:30 +08:00
minggo	e193311e55	Merge pull request #4161 from boyu0/iss2770_fix_warnings ... [ci skip]issue #2770: fix warning	2013-11-10 22:10:10 -08:00
2youyou2	0a72c3c1c2	1.when add a skin to last index, applay it's skindata to the previous skindata ... 2.Do not retain target when regist frame event and movement event	2013-11-11 13:33:47 +08:00
boyu0	6c1144ee79	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
James Chen	a6c85a3906	issue #3137: Disabling Accelerometer when layer is destroyed.	2013-11-11 10:23:05 +08:00
Ricardo Quesada	5faae4a51e	removes exe bit from text files	2013-11-08 11:30:50 -08:00
Liam	2aaa21255f	fixed cocostudio action can not looping	2013-11-08 14:34:24 +08:00
CaiWenzhi	c69163559b	Move some method from helper to reader	2013-11-07 21:26:56 +08:00
CaiWenzhi	af5ab02bc7	temp commit	2013-11-07 14:00:51 +08:00
CaiWenzhi	e765eb1e7a	Test commit	2013-11-06 18:30:09 +08:00
CaiWenzhi	7163dd4d76	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch	2013-11-06 18:13:51 +08:00
2youyou2	3ea0d2f12d	change override function	2013-11-06 16:37:30 +08:00
CaiWenzhi	12570b5e8f	temp commit	2013-11-06 16:20:01 +08:00
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
2youyou2	fcf0b1ef5f	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-11-06 16:06:37 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
2youyou2	efd8f62992	add virtual	2013-11-06 15:40:06 +08:00
2youyou2	12d6bc1722	1. change CCARRAY_FOREACH to range-based loop	2013-11-06 15:25:44 +08:00
2youyou2	f05c1590ae	1.fix particle kCCPositionTypeFree state bug	2013-11-06 11:20:16 +08:00
Ricardo Quesada	84a6aa29cd	Adds more 64-bit fixes ... Replaces more `int` with `long` where it makes sense. Also , it repalces some `unsigned long` with `long` for "lenght" values as described in our c++ guideline	2013-11-05 17:36:44 -08:00
2youyou2	8b86373b08	1.Change to range-based loop	2013-11-05 20:33:29 +08:00
2youyou2	16c23d0ad3	remove CC_PROPERTY and CC_SYNTHESIZE.	2013-11-05 19:53:38 +08:00
2youyou2	3eef64c3b8	1. Change NULL to null ... 2. Remove CocoStudio/Armature files	2013-11-05 15:32:13 +08:00
2youyou2	b076711b69	fix compile error	2013-11-05 13:42:27 +08:00
2youyou2	25196072f2	1. change color json format ... 2. fix tween easing 3. fix CCBone crate bug	2013-11-05 11:57:20 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
James Chen	9be8ca3714	[cmake] output lib to root/lib	2013-11-04 21:03:08 +08:00
James Chen	daa91ad413	[CMake] Update library dependency.	2013-11-04 21:03:07 +08:00
James Chen	922924e1ab	TestCpp is ok.	2013-11-04 21:03:07 +08:00
2youyou2	a9054ba14a	1.add method to set collider filter	2013-11-01 14:36:44 +08:00
2youyou2	005d3c0121	1. fix if frame event is at the last frame, it may emit event several times ... 2. add method for removing single data info 3. add test TEST_DIRECT_LOADING 4. add test TEST_FRAME_EVENT 5. add method for getting calculated collider vertex	2013-10-31 17:28:14 +08:00
Dhilan007	a68d92ff5a	perfect vs-project configuration	2013-10-31 10:51:38 +08:00
yinkaile	80b97be6f4	update develop	2013-10-30 11:34:16 +08:00
yinkaile	8fa8b9f844	update develop	2013-10-30 09:41:40 +08:00
yinkaile	2d3df69982	fix add display	2013-10-29 16:57:06 +08:00
James Chen	48ce5e39fe	EventDispatcher is managed by Director now, like Scheduler and ActionManager.	2013-10-26 15:04:01 +08:00
James Chen	1f3863e787	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +08:00
James Chen	cfaef2a01a	Adding onEnterHook, onXXXHook for Node.	2013-10-25 10:53:45 +08:00
minggo	d07d054a01	issue #2905:ndk-r8e build ok now	2013-10-23 17:44:20 +08:00
minggo	abcf8f268d	fix conflicts	2013-10-22 18:36:13 +08:00
minggo	6a664d480a	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
Dhilan007	232f0d598b	issues #2905:add new vs project	2013-10-21 22:21:11 +08:00
minggo	63c13d8eaa	issue #2905:simplify Android.mk dependence	2013-10-18 14:18:36 +08:00
minggo	e50f9fc43b	issue #2905: jsbinding samples and lua binding samples build ok on android	2013-10-17 15:04:30 +08:00
minggo	91eada6c1e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder	2013-10-16 16:50:46 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
James Chen	6fba0dd5db	issue #2905: [iOS Mac] TestJavascript works now.	2013-10-16 15:43:59 +08:00
James Chen	7dc8aeb156	issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.	2013-10-16 11:19:01 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00