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 · 2014-03-12 10:09:09 +08:00 · 8e125734fe
parent 4ed33fa4c8 04fb80fed4
commit 8e125734fe
938 changed files with 9625 additions and 1159 deletions
--- a/CHANGELOG.REMOVED.git-id
+++ b/CHANGELOG.REMOVED.git-id
@ -1 +1 @@
-727d9ca089cf00365014b23ae2cf63341316ba7d
+9692f61b2341a6b7d3bea76b2ca8ae0c98cf5911
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -46,8 +46,8 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
 option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
 option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)

-option(BUILD_TestCpp "Only build TestCpp sample" ON)
-option(BUILD_TestLua "Only build TestLua sample" OFF)
+option(BUILD_CppTests "Only build TestCpp sample" ON)
+option(BUILD_LuaTests "Only build TestLua sample" OFF)
 else()#temp

 option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
@ -62,8 +62,8 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
 option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
 option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)

-option(BUILD_TestCpp "Only build TestCpp sample" ON)
-option(BUILD_TestLua "Only build TestLua sample" ON)
+option(BUILD_CppTests "Only build TestCpp sample" ON)
+option(BUILD_LuaTests "Only build TestLua sample" ON)
 endif()#temp


@ -144,6 +144,8 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/cocos/physics
  ${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support
  ${CMAKE_CURRENT_SOURCE_DIR}/cocos/math/kazmath
+  ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto
+  ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/manual
  ${CMAKE_CURRENT_SOURCE_DIR}/extensions
  ${CMAKE_CURRENT_SOURCE_DIR}/external
  ${CMAKE_CURRENT_SOURCE_DIR}/external/tinyxml2
@ -289,10 +291,14 @@ endif(BUILD_LIBS_LUA)

 # build tests 

-if(BUILD_TestCpp)
-add_subdirectory(samples/cpp-tests)
-endif(BUILD_TestCpp)
+add_subdirectory(tests/cpp-empty-test)

-if(BUILD_TestLua)
-add_subdirectory(samples/lua-tests/project)
-endif(BUILD_TestLua)
+if(BUILD_CppTests)
+add_subdirectory(tests/cpp-tests)
+endif(BUILD_CppTests)
+
+add_subdirectory(tests/lua-empty-test/project)
+
+if(BUILD_LuaTests)
+add_subdirectory(tests/lua-tests/project)
+endif(BUILD_LuaTests)
--- a/build/android-build.py
+++ b/build/android-build.py
@ -7,8 +7,8 @@ import os, os.path
 import shutil
 from optparse import OptionParser

-CPP_SAMPLES = ['testcpp']
-LUA_SAMPLES = ['testlua']
+CPP_SAMPLES = ['cpp-empty-test', 'cpp-tests']
+LUA_SAMPLES = ['lua-empty-test', 'lua-tests']
 ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES

 def get_num_of_cpu():
@ -146,21 +146,34 @@ def copy_resources(target, app_android_root):
    if os.path.isdir(assets_dir):
        shutil.rmtree(assets_dir)

-    # copy resources(cpp samples and lua samples)
    os.mkdir(assets_dir)
-    resources_dir = os.path.join(app_android_root, "../../res")
-    if os.path.isdir(resources_dir):
-        copy_files(resources_dir, assets_dir)
+
+    # copy resources(cpp samples)
+    if target in CPP_SAMPLES:
+        resources_dir = os.path.join(app_android_root, "../Resources")
+        if os.path.isdir(resources_dir):
+            copy_files(resources_dir, assets_dir)
+

    # lua samples should copy lua script
    if target in LUA_SAMPLES:
+        resources_dir = os.path.join(app_android_root, "../../res")
+        assets_res_dir = os.path.join(assets_dir, "res");
+        os.mkdir(assets_res_dir)
+        copy_files(resources_dir, assets_res_dir)
+
+        resources_dir = os.path.join(app_android_root, "../../src")
+        assets_src_dir = os.path.join(assets_dir, "src");
+        os.mkdir(assets_src_dir)
+        copy_files(resources_dir, assets_src_dir)
+        
        resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script")
        copy_files(resources_dir, assets_dir)

-        # TestLua shared resources with TestCpp
-        if target == "testlua":
+        # lua-tests shared resources with cpp-tests
+        if target == "lua-tests":
            resources_dir = os.path.join(app_android_root, "../../../cpp-tests/Resources")
-            copy_files(resources_dir, assets_dir)
+            copy_files(resources_dir, assets_res_dir)

 def build_samples(target,ndk_build_param,android_platform,build_mode):

@ -186,11 +199,17 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
        build_mode = 'debug'
       
    app_android_root = ''
+
+    target_proj_path_map = {
+        "cpp-empty-test": "tests/cpp-empty-test/proj.android",
+        "cpp-tests": "tests/cpp-tests/proj.android",
+        "lua-empty-test": "tests/lua-empty-test/project/proj.android",
+        "lua-tests": "tests/lua-tests/project/proj.android"
+    }
+
    for target in build_targets:
-        if target == 'testcpp':
-            app_android_root = os.path.join(cocos_root, 'samples/cpp-tests/proj.android')
-        elif target == 'testlua':
-            app_android_root = os.path.join(cocos_root, 'samples/lua-tests/project/proj.android')
+        if target in target_proj_path_map:
+            app_android_root = os.path.join(cocos_root, target_proj_path_map[target])
        else:
            print 'unknown target: %s' % target
            continue
@ -205,14 +224,13 @@ if __name__ == '__main__':
    usage = """
    This script is mainy used for building tests built-in with cocos2d-x.
    
-    Usage: %prog [options] [testcpp|testlua]
+    Usage: %prog [options] [cpp-empty-test|cpp-tests|lua-empty-test|lua-tests]

-    If you are new to cocos2d-x, I recommend you start with testcpp, testlua.
+    If you are new to cocos2d-x, I recommend you start with cpp-empty-test, lua-empty-test.

    You can combine these targets like this:

-    //1. to build simplegame and assetsmanager 
-    python android-build.py -p 10 testcpp testlua
+    python android-build.py -p 10 cpp-empty-test lua-empty-test


    Note: You should install ant to generate apk while building the andriod tests. But it is optional. You can generate apk with eclipse.
--- a/build/cocos2d-win32.vc2012.sln
+++ b/build/cocos2d-win32.vc2012.sln
@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\cpp-tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\cpp-tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
 EndProject
@ -25,7 +25,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\tests\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
 EndProject
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@ -1 +1 @@
-be9729478e98eeb340d839d3cc4c2c2dc9c46b65
+2eabffffc9ac4960f8e1ae33fc712be031827127
--- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
@ -1 +0,0 @@
-93cf35f598f47739015a3d72a8c5749d254b87af
--- a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id
@ -0,0 +1 @@
+1c0cfb1ac4272e26690b9265c721c0a7e5ae83c3
--- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build
+++ b/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build
@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "A035ACBB1782469700987F6C"
-               BuildableName = "build all samples Mac"
-               BlueprintName = "build all samples Mac"
-               ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+               BuildableName = "build all tests Mac"
+               BlueprintName = "build all tests Mac"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
--- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build
+++ b/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build
@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "A07A517B1783A1CC0073F6A7"
-               BuildableName = "build all samples iOS"
-               BlueprintName = "build all samples iOS"
-               ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+               BuildableName = "build all tests iOS"
+               BlueprintName = "build all tests iOS"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test
@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1A0EE1C618CDF6DA004CD58F"
+               BuildableName = "cpp-empty-test Mac.app"
+               BlueprintName = "cpp-empty-test Mac"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE1C618CDF6DA004CD58F"
+            BuildableName = "cpp-empty-test Mac.app"
+            BlueprintName = "cpp-empty-test Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE1C618CDF6DA004CD58F"
+            BuildableName = "cpp-empty-test Mac.app"
+            BlueprintName = "cpp-empty-test Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE1C618CDF6DA004CD58F"
+            BuildableName = "cpp-empty-test Mac.app"
+            BlueprintName = "cpp-empty-test Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test
@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1A0EE31818CDF775004CD58F"
+               BuildableName = "cpp-empty-test iOS.app"
+               BlueprintName = "cpp-empty-test iOS"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE31818CDF775004CD58F"
+            BuildableName = "cpp-empty-test iOS.app"
+            BlueprintName = "cpp-empty-test iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE31818CDF775004CD58F"
+            BuildableName = "cpp-empty-test iOS.app"
+            BlueprintName = "cpp-empty-test iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE31818CDF775004CD58F"
+            BuildableName = "cpp-empty-test iOS.app"
+            BlueprintName = "cpp-empty-test iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests
@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-               BuildableName = "Test cpp Mac.app"
-               BlueprintName = "Test cpp Mac"
-               ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+               BuildableName = "cpp-tests Mac.app"
+               BlueprintName = "cpp-tests Mac"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@ -33,9 +33,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "Test cpp Mac.app"
-            BlueprintName = "Test cpp Mac"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "cpp-tests Mac.app"
+            BlueprintName = "cpp-tests Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </TestAction>
@ -52,9 +52,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "Test cpp Mac.app"
-            BlueprintName = "Test cpp Mac"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "cpp-tests Mac.app"
+            BlueprintName = "cpp-tests Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
@ -70,9 +70,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "Test cpp Mac.app"
-            BlueprintName = "Test cpp Mac"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "cpp-tests Mac.app"
+            BlueprintName = "cpp-tests Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests
@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "A07A517F1783A1D20073F6A7"
-               BuildableName = "Test cpp iOS.app"
-               BlueprintName = "Test cpp iOS"
-               ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+               BuildableName = "cpp-tests iOS.app"
+               BlueprintName = "cpp-tests iOS"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@ -33,9 +33,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "A07A517F1783A1D20073F6A7"
-            BuildableName = "Test cpp iOS.app"
-            BlueprintName = "Test cpp iOS"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "cpp-tests iOS.app"
+            BlueprintName = "cpp-tests iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </TestAction>
@ -52,9 +52,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "A07A517F1783A1D20073F6A7"
-            BuildableName = "Test cpp iOS.app"
-            BlueprintName = "Test cpp iOS"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "cpp-tests iOS.app"
+            BlueprintName = "cpp-tests iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
@ -70,9 +70,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "A07A517F1783A1D20073F6A7"
-            BuildableName = "Test cpp iOS.app"
-            BlueprintName = "Test cpp iOS"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "cpp-tests iOS.app"
+            BlueprintName = "cpp-tests iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test
@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1A0EE2B818CDF733004CD58F"
+               BuildableName = "lua-empty-test Mac.app"
+               BlueprintName = "lua-empty-test Mac"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE2B818CDF733004CD58F"
+            BuildableName = "lua-empty-test Mac.app"
+            BlueprintName = "lua-empty-test Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE2B818CDF733004CD58F"
+            BuildableName = "lua-empty-test Mac.app"
+            BlueprintName = "lua-empty-test Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE2B818CDF733004CD58F"
+            BuildableName = "lua-empty-test Mac.app"
+            BlueprintName = "lua-empty-test Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test
@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1A0EE41918CDF799004CD58F"
+               BuildableName = "lua-empty-test iOS.app"
+               BlueprintName = "lua-empty-test iOS"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE41918CDF799004CD58F"
+            BuildableName = "lua-empty-test iOS.app"
+            BlueprintName = "lua-empty-test iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE41918CDF799004CD58F"
+            BuildableName = "lua-empty-test iOS.app"
+            BlueprintName = "lua-empty-test iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1A0EE41918CDF799004CD58F"
+            BuildableName = "lua-empty-test iOS.app"
+            BlueprintName = "lua-empty-test iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests
@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "1ABCA28518CD91510087CE3A"
-               BuildableName = "Test lua Mac.app"
-               BlueprintName = "Test lua Mac"
-               ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+               BuildableName = "lua-tests Mac.app"
+               BlueprintName = "lua-tests Mac"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@ -33,9 +33,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1ABCA28518CD91510087CE3A"
-            BuildableName = "Test lua Mac.app"
-            BlueprintName = "Test lua Mac"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "lua-tests Mac.app"
+            BlueprintName = "lua-tests Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </TestAction>
@ -52,9 +52,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1ABCA28518CD91510087CE3A"
-            BuildableName = "Test lua Mac.app"
-            BlueprintName = "Test lua Mac"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "lua-tests Mac.app"
+            BlueprintName = "lua-tests Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
@ -70,9 +70,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1ABCA28518CD91510087CE3A"
-            BuildableName = "Test lua Mac.app"
-            BlueprintName = "Test lua Mac"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "lua-tests Mac.app"
+            BlueprintName = "lua-tests Mac"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
--- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests
+++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests
@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "1ABCA2CC18CD93580087CE3A"
-               BuildableName = "Test lua iOS.app"
-               BlueprintName = "Test lua iOS"
-               ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+               BuildableName = "lua-tests iOS.app"
+               BlueprintName = "lua-tests iOS"
+               ReferencedContainer = "container:cocos2d_tests.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@ -33,9 +33,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1ABCA2CC18CD93580087CE3A"
-            BuildableName = "Test lua iOS.app"
-            BlueprintName = "Test lua iOS"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "lua-tests iOS.app"
+            BlueprintName = "lua-tests iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </TestAction>
@ -52,9 +52,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1ABCA2CC18CD93580087CE3A"
-            BuildableName = "Test lua iOS.app"
-            BlueprintName = "Test lua iOS"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "lua-tests iOS.app"
+            BlueprintName = "lua-tests iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <AdditionalOptions>
@ -70,9 +70,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "1ABCA2CC18CD93580087CE3A"
-            BuildableName = "Test lua iOS.app"
-            BlueprintName = "Test lua iOS"
-            ReferencedContainer = "container:cocos2d_samples.xcodeproj">
+            BuildableName = "lua-tests iOS.app"
+            BlueprintName = "lua-tests iOS"
+            ReferencedContainer = "container:cocos2d_tests.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
   </ProfileAction>
--- a/cocos/2d/CCRenderTexture.cpp
+++ b/cocos/2d/CCRenderTexture.cpp
@ -413,34 +413,30 @@ void RenderTexture::visit(Renderer *renderer, const kmMat4 &parentTransform, boo

 bool RenderTexture::saveToFile(const std::string& filename)
 {
-    bool ret = false;
-
-    Image *image = newImage(true);
-    if (image)
-    {
-        ret = image->saveToFile(filename);
-    }
-
-    CC_SAFE_DELETE(image);
-    return ret;
+    return saveToFile(filename,Image::Format::JPG);
 }
 bool RenderTexture::saveToFile(const std::string& fileName, Image::Format format)
 {
-    bool ret = false;
    CCASSERT(format == Image::Format::JPG || format == Image::Format::PNG,
             "the image can only be saved as JPG or PNG format");
+    
+    std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName;
+    _saveToFileCommand.init(_globalZOrder);
+    _saveToFileCommand.func = CC_CALLBACK_0(RenderTexture::onSaveToFile,this,fullpath);
+    
+    Director::getInstance()->getRenderer()->addCommand(&_saveToFileCommand);
+    return true;
+}

+void RenderTexture::onSaveToFile(const std::string& filename)
+{
    Image *image = newImage(true);
    if (image)
    {
-        std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName;
-        
-        ret = image->saveToFile(fullpath.c_str(), true);
+        image->saveToFile(filename.c_str(), true);
    }

    CC_SAFE_DELETE(image);
-
-    return ret;
 }

 /* get buffer as Image */
--- a/cocos/2d/CCRenderTexture.h
+++ b/cocos/2d/CCRenderTexture.h
@ -214,6 +214,7 @@ protected:
    CustomCommand _clearCommand;
    CustomCommand _beginCommand;
    CustomCommand _endCommand;
+    CustomCommand _saveToFileCommand;
 protected:
    //renderer caches and callbacks
    void onBegin();
@ -221,6 +222,8 @@ protected:

    void onClear();
    void onClearDepth();
+
+    void onSaveToFile(const std::string& fileName);
    
    kmMat4 _oldTransMatrix, _oldProjMatrix;
    kmMat4 _transformMatrix, _projectionMatrix;
--- a/cocos/editor-support/cocostudio/TriggerObj.cpp
+++ b/cocos/editor-support/cocostudio/TriggerObj.cpp
@ -115,11 +115,11 @@ bool TriggerObj::detect()
        return true;
    }
    
-    bool ret = true;
+    bool ret = false;

    for (const auto& con : _cons)
    {
-        ret = ret && con->detect();
+        ret = ret || con->detect();
    }

    return ret;
--- a/samples/cpp-hello/.gitkeep
+++ b/samples/cpp-hello/.gitkeep
--- a/samples/cpp-tests/proj.android/jni/Android.mk
+++ b/samples/cpp-tests/proj.android/jni/Android.mk
@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := testcpp_shared
-
-LOCAL_MODULE_FILENAME := libtestcpp
-
-LOCAL_SRC_FILES := testcpp/main.cpp
-
-LOCAL_C_INCLUDES := ../../Classes
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_testcpp_common
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,samples/cpp-tests)
--- a/samples/cpp-tests/proj.android/src/nojava.txt
+++ b/samples/cpp-tests/proj.android/src/nojava.txt
@ -1,3 +0,0 @@
-No Java files
-src/ is required for Android's build.xml to operate correctly.
-git does not allow empty directories in revision control so this file is added to src/ both as a readme and to keep git happy.
--- a/samples/cpp-tests/proj.ios/iphone_Prefix.pch
+++ b/samples/cpp-tests/proj.ios/iphone_Prefix.pch
@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'iphone' target in the 'iphone' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #import <UIKit/UIKit.h>
-#endif
--- a/samples/lua-hello/.gitkeep
+++ b/samples/lua-hello/.gitkeep
--- a/templates/cocos2dx_files.json.REMOVED.git-id
+++ b/templates/cocos2dx_files.json.REMOVED.git-id
@ -1 +1 @@
-28f5c48c4b945edd2e2c3a1a79ab436af8da538e
+e4f656f3e06fc5c267880b95d80deba8b2640c77
--- a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
@ -2,7 +2,6 @@
 #include "CCLuaEngine.h"
 #include "SimpleAudioEngine.h"
 #include "cocos2d.h"
-#include "Runtime.h"

 using namespace CocosDenshion;

@ -24,7 +23,7 @@ bool AppDelegate::applicationDidFinishLaunching()
    auto director = Director::getInstance();
 	auto glview = director->getOpenGLView();
 	if(!glview) {
-		glview = GLView::createWithRect("Test Lua", Rect(0,0,900,640));
+		glview = GLView::createWithRect("HelloLua", Rect(0,0,900,640));
 		director->setOpenGLView(glview);
 	}

@ -36,15 +35,10 @@ bool AppDelegate::applicationDidFinishLaunching()
    // set FPS. the default value is 1.0/60 if you don't call this
    director->setAnimationInterval(1.0 / 60);

-    

-#ifdef COCOS2D_DEBUG
-	startRuntime();
-#else
 	auto engine = LuaEngine::getInstance();
 	ScriptEngineManager::getInstance()->setScriptEngine(engine);
 	engine->executeScriptFile("src/main.lua");
-#endif

    return true;
 }
--- a/templates/lua-template-default/frameworks/runtime-src/build_runtime.py
+++ b/templates/lua-template-default/frameworks/runtime-src/build_runtime.py
@ -1,436 +0,0 @@
-#! /usr/bin/env python
-# coding=utf-8
-# filename=build_runtime.py
-
-import os
-import re
-import sys
-import shutil
-import platform
-import subprocess
-
-if platform.system() == 'Windows':
-    import _winreg
-
-
-def checkParams():
-    """Custom and check param list.
-    """
-    from optparse import OptionParser
-    # set the parser to parse input params
-    # the correspond variable name of "-x, --xxx" is parser.xxx
-
-    if platform.system() == "Darwin":
-        parser = OptionParser(
-            usage="Usage: %prog -p <android|ios|mac>\n\
-            Sample: %prog -p ios"
-        )
-        parser.add_option(
-            "-p",
-            "--platform",
-            metavar="PLATFORM",
-            type="choice",
-            choices=["android", "ios", "mac"],
-            help="Set build runtime's platform"
-        )
-    elif platform.system() == "Windows":
-        parser = OptionParser(
-            usage="Usage: %prog -p <win32|android>\n\
-            Sample: %prog -p win32"
-        )
-        parser.add_option(
-            "-p",
-            "--platform",
-            metavar="PLATFORM",
-            type="choice",
-            choices=["win32", "android"],
-            help="Set build runtime's platform"
-        )
-
-    parser.add_option(
-        "-u",
-        "--pure",
-        dest="pure",
-        action="store_true",
-        help="parameter for copy resource"
-    )
-
-    # parse the params
-    (opts, args) = parser.parse_args()
-    if not opts.platform:
-        parser.error("-p or --platform is not specified")
-    if not opts.pure:
-        return opts.platform, None
-    return opts.platform, opts.pure
-
-
-class BuildRuntime:
-    
-    def __init__(self, platform, pure):
-        self.projectPath = None
-        self.projectName = None
-        self.runtimePlatform = platform
-        self.pure = pure
-        
-        scriptPath = os.path.abspath(os.path.dirname(__file__))
-        if platform == 'win32':
-            self.projectPath = os.path.join(scriptPath, "proj.win32")
-        elif platform == 'android':
-            self.projectPath = os.path.join(scriptPath, "proj.android")
-        elif platform == 'ios':
-            self.projectPath = os.path.join(scriptPath, "proj.ios_mac")
-        elif platform == 'mac':
-            self.projectPath = os.path.join(scriptPath, "proj.ios_mac")
-        
-    def buildRuntime(self):
-        if self.runtimePlatform == 'win32':
-            self.win32Runtime()
-        elif self.runtimePlatform == 'android':
-            self.androidRuntime()
-        if self.runtimePlatform == 'ios':
-            self.iosRuntime()
-        if self.runtimePlatform == 'mac':
-            self.macRuntime()
-            
-    def macRuntime(self):
-        commands = [
-            "xcodebuild",
-            "-version"
-        ]
-        child = subprocess.Popen(commands, stdout=subprocess.PIPE)
-
-        xcode = None
-        version = None
-        for line in child.stdout:
-            if 'Xcode' in line:
-                xcode, version = str.split(line, ' ')
-
-        child.wait()
-
-        if xcode is None:
-            print ("Xcode wasn't installed")
-            return False
-
-        if version <= '5':
-            print ("Update xcode please")
-            return False
-
-        res = self.checkFileByExtention(".xcodeproj")
-        if not res:
-            print ("Can't find the \".xcodeproj\" file")
-            return False
-
-        projectPath = os.path.join(self.projectPath, self.projectName)
-        pbxprojectPath = os.path.join(projectPath, "project.pbxproj")
-        print(pbxprojectPath)
-
-        f = file(pbxprojectPath)
-        contents = f.read()
-
-        section = re.search(
-            r"Begin PBXProject section.*End PBXProject section",
-            contents,
-            re.S
-        )
-
-        if section is None:
-            print ("Can't find Mac target")
-            return False
-
-        targets = re.search(r"targets = (.*);", section.group(), re.S)
-        if targets is None:
-            print ("Can't find Mac target")
-            return False
-
-        targetName = None
-        names = re.split("\*", targets.group())
-        for name in names:
-            if "Mac" in name:
-                targetName = str.strip(name)
-
-        if targetName is None:
-            print ("Can't find Mac target")
-            return False
-
-        macFolder = os.path.join(self.projectPath, "..", "..", "..", "runtime", "mac")
-        if os.path.isdir(macFolder):
-            shutil.rmtree(macFolder)
-
-        commands = [
-            "xcodebuild",
-            "-project",
-            projectPath,
-            "-configuration",
-            "Debug",
-            "-target",
-            targetName,
-            "CONFIGURATION_BUILD_DIR=%s" % (macFolder)
-        ]
-        child = subprocess.Popen(commands, stdout=subprocess.PIPE)
-        for line in child.stdout:
-            print (line)
-
-        child.wait()
-
-        filelist = os.listdir(macFolder)
-        for filename in filelist:
-            name, extention = os.path.splitext(filename)
-            if extention == '.a':
-                filename = os.path.join(macFolder, filename)
-                os.remove(filename)
-            if extention == '.app':
-                filename = os.path.join(macFolder, filename)
-                if ' ' in name:
-                    newname = os.path.join(macFolder, name[:name.find(' ')]+extention)
-                    os.rename(filename, newname)
-    
-    def iosRuntime(self):
-        commands = [
-            "xcodebuild",
-            "-version"
-        ]
-        child = subprocess.Popen(commands, stdout=subprocess.PIPE)
-
-        xcode = None
-        version = None
-        for line in child.stdout:
-            if 'Xcode' in line:
-                xcode, version = str.split(line, ' ')
-
-        child.wait()
-
-        if xcode is None:
-            print ("Xcode wasn't installed")
-            return False
-
-        if version <= '5':
-            print ("Update xcode please")
-            return False
-
-        res = self.checkFileByExtention(".xcodeproj")
-        if not res:
-            print ("Can't find the \".xcodeproj\" file")
-            return False
-
-        projectPath = os.path.join(self.projectPath, self.projectName)
-        pbxprojectPath = os.path.join(projectPath, "project.pbxproj")
-        print(pbxprojectPath)
-
-        f = file(pbxprojectPath)
-        contents = f.read()
-
-        section = re.search(r"Begin PBXProject section.*End PBXProject section", contents, re.S)
-
-        if section is None:
-            print ("Can't find iOS target")
-            return False
-
-        targets = re.search(r"targets = (.*);", section.group(), re.S)
-        if targets is None:
-            print ("Can't find iOS target")
-            return False
-
-        targetName = None
-        names = re.split("\*", targets.group())
-        for name in names:
-            if "iOS" in name:
-                targetName = str.strip(name)
-
-        if targetName is None:
-            print ("Can't find iOS target")
-            return False
-
-        iosFolder = os.path.join(self.projectPath, "..", "..","..", "runtime", "ios")
-        if os.path.isdir(iosFolder):
-            filelist = os.listdir(iosFolder)
-            for filename in filelist:
-                if ".app" in filename:
-                    f = os.path.join(iosFolder, filename)
-                    shutil.rmtree(f)
-
-        commands = [
-            "xcodebuild",
-            "-project",
-            projectPath,
-            "-configuration",
-            "Debug",
-            "-target",
-            targetName,
-            "-sdk",
-            "iphonesimulator",
-            "CONFIGURATION_BUILD_DIR=%s" % (iosFolder)
-        ]
-        child = subprocess.Popen(commands, stdout=subprocess.PIPE)
-        for line in child.stdout:
-            print (line)
-
-        child.wait()
-
-        filelist = os.listdir(iosFolder)
-
-        for filename in filelist:
-            name, extention = os.path.splitext(filename)
-            if extention == '.a':
-                filename = os.path.join(iosFolder, filename)
-                os.remove(filename)
-            if extention == '.app':
-                filename = os.path.join(iosFolder, filename)
-                newname = os.path.join(iosFolder, name[:name.find(' ')]+extention)
-                os.rename(filename, newname)
-
-    def androidRuntime(self):
-        try:
-            SDK_ROOT = os.environ['ANDROID_SDK_ROOT']
-        except Exception:
-            print ("ANDROID_SDK_ROOT not defined.\
-             Please define ANDROID_SDK_ROOT in your environment")
-            return False
-        
-        try:
-            NDK_ROOT = os.environ['NDK_ROOT']
-        except Exception:
-            print ("NDK_ROOT not defined.\
-             Please define NDK_ROOT in your environment")
-            return False
-        
-        platformsPath = os.path.join(SDK_ROOT,"platforms")
-        if not os.path.isdir(platformsPath):
-            print ("Can't find android platforms")
-            return False
-
-        projectProperties = os.path.join(self.projectPath, "project.properties")
-        androidVersion = None
-        if os.path.isfile(projectProperties):
-            f = file(projectProperties, 'r')
-            while True:
-                line = f.readline()
-                if "target=" in line and not "#" in line:
-                    androidVersion = line[line.find('-')+1:]
-                    break
-                if len(line) == 0:
-                    break
-
-        if androidVersion is None:
-            platforms = os.listdir(platformsPath)
-            versions = []
-            for platform in platforms:
-                if "android-" in platform:
-                    version = platform[platform.find('-')+1:]
-                    versions.append(version)
-            versions = [x for x in map(float, versions) if x > 10.0]
-            if len(versions) == 0:
-                print ("Please update your android sdk")
-                return False
-            androidVersion = min(versions)
-
-        if androidVersion is None or int(androidVersion) < 10:
-            print ("Please update your android sdk or reset android sdk version in the project.properties file")
-            return False
-        
-        buildNative = os.path.join(self.projectPath, "build_native.py")
-        if not os.path.isdir(self.projectPath) or not os.path.isfile(buildNative):
-            print ("Can't find the build_native.py")
-            return False
-        
-        sys.path.append(self.projectPath)
-        from build_native import build
-        build(None, str(int(androidVersion)), None, self.pure)
-        
-    def win32Runtime(self):
-        try:
-            vs = _winreg.OpenKey(
-                _winreg.HKEY_LOCAL_MACHINE,
-                r"SOFTWARE\Microsoft\VisualStudio"
-            )
-
-            msbuild = _winreg.OpenKey(
-                _winreg.HKEY_LOCAL_MACHINE,
-                r"SOFTWARE\Microsoft\MSBuild\ToolsVersions"
-            )
-
-        except WindowsError:
-            print ("Visual Studio wasn't installed")
-            return False
-
-        vsPath = None
-        i = 0
-        try:
-            while True:
-                version = _winreg.EnumKey(vs, i)
-                try:
-                    if float(version) >= 11.0:
-                        key = _winreg.OpenKey(vs, r"SxS\VS7")
-                        vsPath,type = _winreg.QueryValueEx(key, version)
-                except:
-                    pass
-                i += 1
-        except WindowsError:
-            pass
-
-        if vsPath is None:
-            print("Can't find the Visual Studio's path in the regedit")
-            return False
-
-        msbuildPath = None
-        i = 0
-        try:
-            while True:
-                version = _winreg.EnumKey(msbuild,i)
-                try:
-                    if float(version) >= 4.0:
-                        key = _winreg.OpenKey(msbuild, version)
-                        msbuildPath, type = _winreg.QueryValueEx(
-                            key, 
-                            "MSBuildToolsPath"
-                        )
-                except:
-                    pass
-                i += 1
-        except WindowsError:
-            pass
-
-        if msbuildPath is None:
-            print ("Can't find the MSBuildTools' path in the regedit")
-            return False
-
-        res = self.checkFileByExtention(".sln")
-        if not res:
-            print ("Can't find the \".sln\" file")
-            return False
-
-        msbuildPath = os.path.join(msbuildPath, "MSBuild.exe")
-        projectPath = os.path.join(self.projectPath, self.projectName)
-        commands = [
-            msbuildPath,
-            projectPath,
-            "/maxcpucount:4",
-            "/t:build",
-            "/p:configuration=Debug"
-        ]
-
-        child = subprocess.Popen(commands, stdout=subprocess.PIPE)
-        for line in child.stdout:
-            print (line)
-
-        child.wait()
-
-        return True
-        
-    def checkFileByExtention(self, ext, path=None):
-        filelist = ""
-        if path is None:
-            filelist = os.listdir(self.projectPath)
-        else:
-            filelist = os.listdir(path)
-
-        for file in filelist:
-            name, extention = os.path.splitext(file)
-            if extention == ext:
-                self.projectName = file
-                return True
-        return False
-                
-if __name__ == '__main__':
-    platform, pure = checkParams();
-    buildRuntime = BuildRuntime(platform, pure)
-    buildRuntime.buildRuntime()
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/build_native.py
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/build_native.py
@ -1,193 +0,0 @@
-#!/usr/bin/python
-# build_native.py
-# Build native codes
-
-
-import sys
-import os, os.path
-import shutil
-from optparse import OptionParser
-
-def get_num_of_cpu():
-	''' The build process can be accelerated by running multiple concurrent job processes using the -j-option.
-	'''
-	try:
-		platform = sys.platform
-		if platform == 'win32':
-			if 'NUMBER_OF_PROCESSORS' in os.environ:
-				return int(os.environ['NUMBER_OF_PROCESSORS'])
-			else:
-				return 1
-		else:
-			from numpy.distutils import cpuinfo
-			return cpuinfo.cpu._getNCPUs()
-	except Exception:
-		print "Can't know cpuinfo, use default 1 cpu"
-		return 1
-
-def check_environment_variables_sdk():
-    ''' Checking the environment ANDROID_SDK_ROOT, which will be used for building
-    '''
-
-    try:
-        SDK_ROOT = os.environ['ANDROID_SDK_ROOT']
-    except Exception:
-        print "ANDROID_SDK_ROOT not defined. Please define ANDROID_SDK_ROOT in your environment"
-        sys.exit(1)
-
-    return SDK_ROOT
-
-def check_environment_variables():
-    ''' Checking the environment NDK_ROOT, which will be used for building
-    '''
-
-    try:
-        NDK_ROOT = os.environ['NDK_ROOT']
-    except Exception:
-        print "NDK_ROOT not defined. Please define NDK_ROOT in your environment"
-        sys.exit(1)
-
-    return NDK_ROOT
-
-def select_toolchain_version():
-    '''Because ndk-r8e uses gcc4.6 as default. gcc4.6 doesn't support c++11. So we should select gcc4.7 when
-    using ndk-r8e. But gcc4.7 is removed in ndk-r9, so we should determine whether gcc4.7 exist.
-    Conclution:
-    ndk-r8e  -> use gcc4.7
-    ndk-r9   -> use gcc4.8
-    '''
-
-    ndk_root = check_environment_variables()
-    if os.path.isdir(os.path.join(ndk_root,"toolchains/arm-linux-androideabi-4.8")):
-        os.environ['NDK_TOOLCHAIN_VERSION'] = '4.8'
-        print "The Selected NDK toolchain version was 4.8 !"
-    elif os.path.isdir(os.path.join(ndk_root,"toolchains/arm-linux-androideabi-4.7")):
-        os.environ['NDK_TOOLCHAIN_VERSION'] = '4.7'
-        print "The Selected NDK toolchain version was 4.7 !"
-    else:
-        print "Couldn't find the gcc toolchain."
-        exit(1)
-
-def check_ant_variables():
-    ''' Checking the environment ANT, which will be used for package
-    '''
-    try:
-        ANT_PATH = os.environ['ANT_PATH']
-    except Exception:
-        print "ANT_PATH not defined. Please define ANT_PATH in your environment"
-        sys.exit(1)
-
-    return ANT_PATH
-
-def do_build(cocos_root, ndk_root, app_android_root,ndk_build_param,sdk_root,android_platform,build_mode):
-
-    ndk_path = os.path.join(ndk_root, "ndk-build")
-
-    # windows should use ";" to seperate module paths
-    platform = sys.platform
-    if platform == 'win32':
-        ndk_module_path = 'NDK_MODULE_PATH=%s/..;%s/../external;%s;%s/external;%s/cocos' % (cocos_root, cocos_root, cocos_root, cocos_root, cocos_root)
-    else:
-        ndk_module_path = 'NDK_MODULE_PATH=%s/..:%s/../external:%s:%s/external:%s/cocos' % (cocos_root, cocos_root, cocos_root, cocos_root, cocos_root)
-
-    num_of_cpu = get_num_of_cpu()
-
-    if ndk_build_param == None:
-        command = '%s -j%d -C %s %s' % (ndk_path, num_of_cpu, app_android_root, ndk_module_path)
-    else:
-        command = '%s -j%d -C %s %s %s' % (ndk_path, num_of_cpu, app_android_root, ''.join(str(e) for e in ndk_build_param), ndk_module_path)
-    if os.system(command) != 0:
-        raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!")
-    elif android_platform is not None:
-    	  sdk_tool_path = os.path.join(sdk_root, "tools/android")
-    	  cocoslib_path = os.path.join(cocos_root, "cocos/2d/platform/android/java")
-    	  command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path)
-    	  if os.system(command) != 0:
-    	  	  raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!")
-    	  command = '%s update project -t %s -p %s -s' % (sdk_tool_path,android_platform,app_android_root)
-    	  if os.system(command) != 0:
-    	  	  raise Exception("update project [ " + app_android_root + " ] fails!")
-          ant_path=check_ant_variables()
-          ant_path = os.path.join(ant_path, "ant")
-    	  buildfile_path = os.path.join(app_android_root, "build.xml")
-    	  command = '%s clean %s -f %s -Dsdk.dir=%s' % (ant_path,build_mode,buildfile_path,sdk_root)
-    	  os.system(command)
-
-def copy_files(src, dst):
-
-    for item in os.listdir(src):
-        path = os.path.join(src, item)
-        # Android can not package the file that ends with ".gz"
-        if not item.startswith('.') and not item.endswith('.gz') and os.path.isfile(path):
-            shutil.copy(path, dst)
-        if os.path.isdir(path):
-            new_dst = os.path.join(dst, item)
-            os.makedirs(new_dst)
-            copy_files(path, new_dst)
-
-def copy_resources(app_android_root, build_mode, pure):
-
-    # remove app_android_root/assets if it exists
-    assets_dir = os.path.join(app_android_root, "assets")
-    if os.path.isdir(assets_dir):
-        shutil.rmtree(assets_dir)
-
-    # copy resources
-    os.mkdir(assets_dir)
-
-    if pure is None:
-        assets_res_dir = assets_dir + "/res";
-        assets_scripts_dir = assets_dir + "/scripts";
-        os.mkdir(assets_res_dir);
-        os.mkdir(assets_scripts_dir);
-
-        resources_dir = os.path.join(app_android_root, "../../../res")
-        copy_files(resources_dir, assets_res_dir)
-
-        resources_dir = os.path.join(app_android_root, "../../../src")
-        copy_files(resources_dir, assets_scripts_dir)
-
-    # lua project should copy lua script
-    resources_dir = os.path.join(app_android_root, "../../lua-bindings/bindings/script")
-    copy_files(resources_dir, assets_dir)
-
-def build(ndk_build_param,android_platform,build_mode,pure):
-
-    ndk_root = check_environment_variables()
-    sdk_root = None
-    select_toolchain_version()
-
-    current_dir = os.path.dirname(os.path.realpath(__file__))
-    cocos_root = os.path.join(current_dir, "../../lua-bindings/cocos2d-x")
-
-    app_android_root = current_dir
-    copy_resources(app_android_root, build_mode, pure)
-
-    if android_platform is not None:
-				sdk_root = check_environment_variables_sdk()
-				if android_platform.isdigit():
-						android_platform = 'android-'+android_platform
-				else:
-						print 'please use vaild android platform'
-						exit(1)
-
-    if build_mode is None:
-    	  build_mode = 'debug'
-    elif build_mode != 'release':
-        build_mode = 'debug'
-
-    do_build(cocos_root, ndk_root, app_android_root,ndk_build_param,sdk_root,android_platform,build_mode)
-
-# -------------- main --------------
-if __name__ == '__main__':
-
-    parser = OptionParser()
-    parser.add_option("-n", "--ndk", dest="ndk_build_param", help='parameter for ndk-build')
-    parser.add_option("-p", "--platform", dest="android_platform",
-    help='parameter for android-update.Without the parameter,the script just build dynamic library for project. Valid android-platform are:[10|11|12|13|14|15|16|17|18|19]')
-    parser.add_option("-b", "--build", dest="build_mode",
-    help='the build mode for java project,debug[default] or release.Get more information,please refer to http://developer.android.com/tools/building/building-cmdline.html')
-    parser.add_option("-u", "--pure", dest="pure", help='parameter for copy resource')
-    (opts, args) = parser.parse_args()
-
-    build(opts.ndk_build_param,opts.android_platform,opts.build_mode,opts.pure)
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/custom_rules.xml
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/custom_rules.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="custom_rules">	
-	<target name="-post-build">
-		<!-- delete temp files -->
-		<delete>
-			<fileset dir="${out.absolute.dir}" includes="build.prop resources.ap_ ${dex.file.name}* ${resource.package.file.name}* ${ant.project.name}-release-unaligned.apk ${ant.project.name}-release-unsigned.apk*"/>
-		</delete>
-		<!-- rename final apk file -->
-        <property name="apk.final.name" value="${out.absolute.dir}/../../../../runtime/android/${ant.project.name}" />
-        <move file="${out.final.file}" tofile="${apk.final.name}.apk" />
-	</target>
-</project>
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
@ -7,13 +7,11 @@ LOCAL_MODULE := cocos2dlua_shared
 LOCAL_MODULE_FILENAME := libcocos2dlua

 LOCAL_SRC_FILES := hellolua/main.cpp \
-				   hellolua/Runtime_android.cpp \
-                   ../../Classes/AppDelegate.cpp \
-                   ../../Classes/Runtime.cpp
+                   ../../Classes/AppDelegate.cpp


 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
-                    $(LOCAL_PATH)/../../cocos2d/external/lua/tolua
+                    $(LOCAL_PATH)/../../cocos2d-x/external/lua/tolua
 					
 LOCAL_STATIC_LIBRARIES := curl_static_prebuilt

--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties
@ -10,4 +10,4 @@
 # Project target.
 target=android-10

-android.library.reference.1=../../lua-bindings/cocos2d-x/cocos/2d/platform/android/java
+android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java
@ -40,49 +40,6 @@ public class Cocos2dxActivity extends NativeActivity{
 		
 		//2.Set the format of window
 		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		if(!isWifiConnected())
-		{
-			Toast.makeText(this, "wifi is closed!", Toast.LENGTH_SHORT).show();
-			startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
-		}
-	}
-	
-	 private boolean isWifiConnected() {  
-	        ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);  
-	        if (cm != null) {  
-	            NetworkInfo networkInfo = cm.getActiveNetworkInfo();  
-	            if (networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {  
-	                return true;  
-	            }  
-	        }  
-	        return false;  
-	    } 
-	 
-	public static String getLocalIpAddress() {
-		try {
-			for (Enumeration<NetworkInterface> en = NetworkInterface
-					.getNetworkInterfaces(); en.hasMoreElements();) {
-				NetworkInterface intf = en.nextElement();
-				for (Enumeration<InetAddress> enumIpAddr = intf
-						.getInetAddresses(); enumIpAddr.hasMoreElements();) {
-					InetAddress inetAddress = enumIpAddr.nextElement();
-					if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress()) {
-						return inetAddress.getHostAddress().toString();
-					}
-				}
-			}
-		} catch (SocketException ex) {
-			Log.e("WifiPreference IpAddress", ex.toString());
-		}
-		return null;
-	}
-	
-	public static String getSDCardPath() {
-		if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-			String strSDCardPathString = Environment.getExternalStorageDirectory().getPath();
-           return  strSDCardPathString;
-		}
-		return null;
 	}
 	
 }
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
@ -92,16 +92,7 @@
 		C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; };
 		C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B418BF654500FE4F13 /* libluabindings Mac.a */; };
 		C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B618BF654500FE4F13 /* libluabindings iOS.a */; };
-		C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; };
-		C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; };
-		C07828F818B4D72E00BD2287 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C07828F418B4D72E00BD2287 /* main.m */; };
-		C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C07828F518B4D72E00BD2287 /* MainMenu.xib */; };
-		C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = C07828F718B4D72E00BD2287 /* SimulatorApp.mm */; };
-		C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07828FB18B4DC6F00BD2287 /* Runtime.cpp */; };
-		C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07828FB18B4DC6F00BD2287 /* Runtime.cpp */; };
-		C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */; };
-		C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */; };
-		C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */; };
+		C06E23C418CEF9740093C81A /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06E23C318CEF9740093C81A /* main.cpp */; };
 		D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; };
 		F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; };
 		F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; };
@ -284,9 +275,9 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../lua-bindings/cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = "<group>"; };
+		15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = "<group>"; };
 		15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; };
-		15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../lua-bindings/cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = "<group>"; };
+		15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = "<group>"; };
 		1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
 		5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
@ -320,39 +311,28 @@
 		50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../lua-bindings/bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = "<group>"; };
+		C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../cocos2d-x/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = "<group>"; };
 		C03781B718BF655400FE4F13 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../../res; sourceTree = "<group>"; };
 		C03781B818BF655400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = "<group>"; };
-		C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../lua-bindings/bindings/script/AudioEngine.lua"; sourceTree = "<group>"; };
-		C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../lua-bindings/bindings/script/CCBReaderLoad.lua"; sourceTree = "<group>"; };
-		C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../lua-bindings/bindings/script/Cocos2d.lua"; sourceTree = "<group>"; };
-		C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../lua-bindings/bindings/script/Cocos2dConstants.lua"; sourceTree = "<group>"; };
-		C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../lua-bindings/bindings/script/CocoStudio.lua"; sourceTree = "<group>"; };
-		C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../lua-bindings/bindings/script/Deprecated.lua"; sourceTree = "<group>"; };
-		C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../lua-bindings/bindings/script/DeprecatedClass.lua"; sourceTree = "<group>"; };
-		C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../lua-bindings/bindings/script/DeprecatedEnum.lua"; sourceTree = "<group>"; };
-		C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../lua-bindings/bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = "<group>"; };
-		C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../lua-bindings/bindings/script/DrawPrimitives.lua"; sourceTree = "<group>"; };
-		C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../lua-bindings/bindings/script/extern.lua"; sourceTree = "<group>"; };
-		C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../lua-bindings/bindings/script/GuiConstants.lua"; sourceTree = "<group>"; };
-		C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../lua-bindings/bindings/script/json.lua"; sourceTree = "<group>"; };
-		C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../lua-bindings/bindings/script/luaj.lua"; sourceTree = "<group>"; };
-		C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../lua-bindings/bindings/script/luaoc.lua"; sourceTree = "<group>"; };
-		C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../lua-bindings/bindings/script/Opengl.lua"; sourceTree = "<group>"; };
-		C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../lua-bindings/bindings/script/OpenglConstants.lua"; sourceTree = "<group>"; };
-		C03781CE18BF656A00FE4F13 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../lua-bindings/bindings/script/StudioConstants.lua"; sourceTree = "<group>"; };
-		C0619CD61896894800872C26 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = "<group>"; };
-		C07828F418B4D72E00BD2287 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		C07828F518B4D72E00BD2287 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
-		C07828F618B4D72E00BD2287 /* SimulatorApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatorApp.h; sourceTree = "<group>"; };
-		C07828F718B4D72E00BD2287 /* SimulatorApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimulatorApp.mm; sourceTree = "<group>"; };
-		C07828FB18B4DC6F00BD2287 /* Runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Runtime.cpp; path = ../Classes/Runtime.cpp; sourceTree = "<group>"; };
-		C07828FC18B4DC6F00BD2287 /* Runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Runtime.h; path = ../Classes/Runtime.h; sourceTree = "<group>"; };
-		C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WorkSpaceDialog.xib; sourceTree = "<group>"; };
-		C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkSpaceDialogController.h; sourceTree = "<group>"; };
-		C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WorkSpaceDialogController.mm; sourceTree = "<group>"; };
-		C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAppSheetAdditions.h; sourceTree = "<group>"; };
-		C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAppSheetAdditions.m; sourceTree = "<group>"; };
+		C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = "<group>"; };
+		C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = "<group>"; };
+		C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = "<group>"; };
+		C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = "<group>"; };
+		C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = "<group>"; };
+		C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = "<group>"; };
+		C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = "<group>"; };
+		C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = "<group>"; };
+		C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = "<group>"; };
+		C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = "<group>"; };
+		C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = "<group>"; };
+		C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = "<group>"; };
+		C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = "<group>"; };
+		C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = "<group>"; };
+		C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = "<group>"; };
+		C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = "<group>"; };
+		C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = "<group>"; };
+		C03781CE18BF656A00FE4F13 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/StudioConstants.lua"; sourceTree = "<group>"; };
+		C06E23C318CEF9740093C81A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		D6B061341803AC000077942B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
 		F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@ -479,16 +459,8 @@
 		5023817117EBBE3400990C9B /* mac */ = {
 			isa = PBXGroup;
 			children = (
-				C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */,
-				C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */,
-				C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */,
-				C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */,
-				C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */,
+				C06E23C318CEF9740093C81A /* main.cpp */,
 				5023817217EBBE3400990C9B /* Icon.icns */,
-				C07828F418B4D72E00BD2287 /* main.m */,
-				C07828F518B4D72E00BD2287 /* MainMenu.xib */,
-				C07828F618B4D72E00BD2287 /* SimulatorApp.h */,
-				C07828F718B4D72E00BD2287 /* SimulatorApp.mm */,
 				5023817317EBBE3400990C9B /* Info.plist */,
 				5023817517EBBE3400990C9B /* Prefix.pch */,
 			);
@ -575,9 +547,6 @@
 		F293BB7C15EB830F00256477 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				C07828FB18B4DC6F00BD2287 /* Runtime.cpp */,
-				C07828FC18B4DC6F00BD2287 /* Runtime.h */,
-				C0619CD61896894800872C26 /* Runtime_ios-mac.mm */,
 				F293BB7E15EB831F00256477 /* AppDelegate.cpp */,
 				F293BB7F15EB831F00256477 /* AppDelegate.h */,
 			);
@ -782,13 +751,11 @@
 				C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */,
 				C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */,
 				C03781BA18BF655400FE4F13 /* res in Resources */,
-				C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */,
 				C03781BC18BF655400FE4F13 /* src in Resources */,
 				C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */,
 				C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */,
 				C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */,
 				C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */,
-				C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */,
 				5023817617EBBE3400990C9B /* Icon.icns in Resources */,
 				C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */,
 				C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */,
@ -852,13 +819,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */,
+				C06E23C418CEF9740093C81A /* main.cpp in Sources */,
 				5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */,
-				C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */,
-				C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */,
-				C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */,
-				C07828F818B4D72E00BD2287 /* main.m in Sources */,
-				C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -869,8 +831,6 @@
 				5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */,
 				F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */,
 				5023812417EBBCAC00990C9B /* main.m in Sources */,
-				C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */,
-				C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */,
 				5023811817EBBCAC00990C9B /* AppController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@ -966,7 +926,7 @@
 					10000,
 				);
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../lua-bindings/cocos2d-x/external/glfw3/include/mac";
+				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac";
 			};
 			name = Debug;
 		};
@ -992,7 +952,7 @@
 					10000,
 				);
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../lua-bindings/cocos2d-x/external/glfw3/include/mac";
+				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac";
 			};
 			name = Release;
 		};
@ -1018,7 +978,7 @@
 				HEADER_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../lua-bindings/cocos2d-x $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/base $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/physics $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/gui $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/network $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/audio/include $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/editor-support $(SRCROOT)/../../lua-bindings/cocos2d-x/extensions $(SRCROOT)/../../lua-bindings/cocos2d-x/external $(SRCROOT)/../../lua-bindings/cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../lua-bindings/external/luajit/include $(SRCROOT)/../../lua-bindings/external/tolua $(SRCROOT)/../../lua-bindings/bindings/manual $(SRCROOT)/../../lua-bindings/bindings/auto";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto";
 			};
 			name = Debug;
 		};
@ -1039,7 +999,7 @@
 				HEADER_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../lua-bindings/cocos2d-x $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/base $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/physics $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/gui $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/network $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/audio/include $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/editor-support $(SRCROOT)/../../lua-bindings/cocos2d-x/extensions $(SRCROOT)/../../lua-bindings/cocos2d-x/external $(SRCROOT)/../../lua-bindings/cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../lua-bindings/external/luajit/include $(SRCROOT)/../../lua-bindings/external/tolua $(SRCROOT)/../../lua-bindings/bindings/manual $(SRCROOT)/../../lua-bindings/bindings/auto";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@ -1063,7 +1023,7 @@
 				LIBRARY_SEARCH_PATHS = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/ios";
+				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios";
 			};
 			name = Debug;
 		};
@ -1085,7 +1045,7 @@
 				LIBRARY_SEARCH_PATHS = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/ios";
+				USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios";
 			};
 			name = Release;
 		};
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp
@ -0,0 +1,34 @@
+/****************************************************************************
+ Copyright (c) 2010 cocos2d-x.org
+ 
+ http://www.cocos2d-x.org
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#include "AppDelegate.h"
+#include "cocos2d.h"
+
+USING_NS_CC;
+
+int main(int argc, char *argv[])
+{
+    AppDelegate app;
+    return Application::getInstance()->run();
+}
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln
@ -11,32 +11,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxpro
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\lua-bindings\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
 	ProjectSection(ProjectDependencies) = postProject
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
 		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\lua-bindings\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\lua-bindings\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\lua-bindings\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\lua-bindings\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\lua-bindings\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\lua-bindings\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\lua-bindings\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\lua-bindings\bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\lua-bindings\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
@ -36,13 +36,13 @@
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -66,7 +66,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)..\bindings\auto;$(EngineRoot)..\bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)..\external\lua;$(EngineRoot)..\external\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@ -75,7 +75,7 @@
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
@ -109,7 +109,7 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
 mkdir "$(OutDir)\Resource"
 mkdir "$(OutDir)\Resource\src"
 mkdir "$(OutDir)\Resource\res"
-xcopy "$(ProjectDir)..\..\lua-bindings\bindings\script" "$(OutDir)\Resource" /e /Y
+xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
 xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
 xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y</Command>
      <Message>copy files</Message>
@ -121,7 +121,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)..\bindings\auto;$(EngineRoot)..\bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)..\external\lua;$(EngineRoot)..\external\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@ -129,7 +129,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
      <ExceptionHandling>
      </ExceptionHandling>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
@ -163,12 +163,11 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
 mkdir "$(OutDir)\Resource"
 mkdir "$(OutDir)\Resource\src"
 mkdir "$(OutDir)\Resource\res"
-xcopy "$(ProjectDir)..\..\lua-bindings\bindings\script" "$(OutDir)\Resource" /e /Y
+xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
 xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
 xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y</Command>
      <Message>copy files</Message>
    </PreBuildEvent>
-
    <PreLinkEvent>
      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
 xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
@ -176,55 +175,54 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\Classes\AppDelegate.h" />
-    <ClInclude Include="..\Classes\Runtime.h" />
    <ClInclude Include="main.h" />
-    <ClInclude Include="SimulatorWindow.h" />
+    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-    <ClCompile Include="..\Classes\Runtime.cpp" />
    <ClCompile Include="main.cpp" />
-    <ClCompile Include="Runtime_win32.cpp" />
-    <ClCompile Include="SimulatorWindow.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="game.rc" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2d.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj">
      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj">
      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
      <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj">
      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj">
      <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\bindings\proj.win32\liblua.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj">
      <Project>{ddc3e27f-004d-4dd4-9dd3-931a013d2159}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj">
      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lua-bindings\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj">
+    <ProjectReference Include="..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj">
      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\game.ico" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters
@ -18,12 +18,7 @@
    <ClInclude Include="main.h">
      <Filter>win32</Filter>
    </ClInclude>
-    <ClInclude Include="SimulatorWindow.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\Runtime.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
+    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\Classes\AppDelegate.cpp">
@ -32,19 +27,13 @@
    <ClCompile Include="main.cpp">
      <Filter>win32</Filter>
    </ClCompile>
-    <ClCompile Include="SimulatorWindow.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="Runtime_win32.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\Runtime.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="game.rc">
      <Filter>resource</Filter>
    </ResourceCompile>
  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\game.ico" />
+  </ItemGroup>
 </Project>
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/Runtime_win32.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/Runtime_win32.cpp
@ -1,52 +0,0 @@
-
-#include <io.h>
-#include <direct.h>
-#include <stdio.h>
-#include <vector>
-#include <string>
-
-#include "cocos2d.h"
-using namespace std;
-
-
-string getProjSearchPath()
-{
-	extern std::string getCurAppPath(void);
-	string searchPath = getCurAppPath();
-	searchPath += "/../..";
-	char fuldir[MAX_PATH]={0};
-	_fullpath(fuldir,searchPath.c_str(),MAX_PATH);
-	return fuldir;
-}
-
-vector<string> getSearchPath()
-{
-	extern std::string getCurAppPath(void);
-	vector<string> searchPathArray;
-	string searchPathRes = getCurAppPath();
-	searchPathRes += "/Resources";
-	searchPathArray.push_back(getProjSearchPath());
-	searchPathArray.push_back(searchPathRes);
-	return searchPathArray;
-}
-
-string getIPAddress()
-{
-	WSADATA wsaData;  
-	char name[155]={0};
-	char *ip=nullptr;
-	PHOSTENT hostinfo;
-
-	if ( WSAStartup( MAKEWORD(2,0), &wsaData ) == 0 )   
-	{  
-		if( gethostname ( name, sizeof(name)) == 0)   
-		{ 
-			if((hostinfo = gethostbyname(name)) != NULL)   
-			{ 
-				ip = inet_ntoa (*(struct in_addr *)*hostinfo->h_addr_list);
-			}   
-		}   
-		WSACleanup( );
-	}   
-	return ip;
-}
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/game.rc
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/game.rc
@ -14,29 +14,37 @@

 /////////////////////////////////////////////////////////////////////////////
 // Chinese (Simplified, PRC) resources
+
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 #pragma code_page(936)
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
 //
+
 2 TEXTINCLUDE 
 BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
 END
+
 3 TEXTINCLUDE 
 BEGIN
    "\r\n"
    "\0"
 END
+
 #endif    // APSTUDIO_INVOKED
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Menu
 //
+
 IDR_MENU_COCOS MENU
 BEGIN
    POPUP "&File"
@ -50,7 +58,10 @@ BEGIN
        MENUITEM "&Portrait",                   ID_VIEW_PORTRAIT
        MENUITEM "&Landscape",                  ID_VIEW_LANDSCAPE
        MENUITEM SEPARATOR
-        MENUITEM "&Custom",                     ID_VIEW_CUSTOM
+        MENUITEM "&Actual(100%)",               ID_VIEW_ZOOMOUT100
+        MENUITEM "Zoom Out(75%)",               ID_VIEW_ZOOMOUT75
+        MENUITEM "Zoom Out(50%)",               ID_VIEW_ZOOMOUT50
+        MENUITEM "Zoom Out(25%)",               ID_VIEW_ZOOMOUT25
    END
    POPUP "&Control"
    BEGIN
@ -61,10 +72,13 @@ BEGIN
        MENUITEM "&About ...",                  ID_HELP_ABOUT
    END
 END
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
+
 IDD_DIALOG_ABOUT DIALOGEX 0, 0, 243, 94
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Simulator"
@ -73,6 +87,7 @@ BEGIN
    DEFPUSHBUTTON   "OK",IDOK,173,69,63,18
    LTEXT           "Cocos2d-x-Simulator",IDC_STATIC,29,17,169,25
 END
+
 IDD_DIALOG_VIEWCUSTOM DIALOGEX 0, 0, 179, 98
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Custom"
@ -85,10 +100,13 @@ BEGIN
    EDITTEXT        IDC_EDIT_WIDTH,60,15,89,14,ES_AUTOHSCROLL
    EDITTEXT        IDC_EDIT_HEIGHT,62,36,87,14,ES_AUTOHSCROLL
 END
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
 //
+
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO
 BEGIN
@ -99,6 +117,7 @@ BEGIN
        TOPMARGIN, 7
        BOTTOMMARGIN, 87
    END
+
    IDD_DIALOG_VIEWCUSTOM, DIALOG
    BEGIN
        LEFTMARGIN, 7
@ -108,8 +127,11 @@ BEGIN
    END
 END
 #endif    // APSTUDIO_INVOKED
+
 #endif    // Chinese (Simplified, PRC) resources
 /////////////////////////////////////////////////////////////////////////////
+
+
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources

@ -130,6 +152,7 @@ END

 #endif    // APSTUDIO_INVOKED

+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@ -137,7 +160,7 @@ END

 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-GLFW_ICON           ICON                    "res\\game.ico"
+GLFW_ICON               ICON                    "res\\game.ico"

 /////////////////////////////////////////////////////////////////////////////
 //
@ -179,10 +202,15 @@ END
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////

+
+
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
+
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp
@ -1,7 +1,6 @@
 #include "main.h"
 #include "AppDelegate.h"
 #include "cocos2d.h"
-#include "SimulatorWindow.h"

 USING_NS_CC;

@ -25,8 +24,6 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,

    // create the application instance
    AppDelegate app;
-	createSimulator("HelloLua",960,640);
-
    int ret = Application::getInstance()->run();

 #ifdef USE_WIN32_CONSOLE
@ -35,25 +32,3 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,

    return ret;
 }
-std::string getCurAppPath(void)
-{
-	TCHAR szAppDir[MAX_PATH]={0};
-	if (!GetModuleFileName(NULL,szAppDir,MAX_PATH))
-		return "";
-	int nEnd=0;
-	for (int i=0;szAppDir[i];i++)
-	{
-		if(szAppDir[i]=='\\')
-			nEnd = i;
-	}
-	szAppDir[nEnd] = 0;
-	int iLen = 2*wcslen(szAppDir);    
-	char* chRtn = new char[iLen+1];    
-	wcstombs(chRtn,szAppDir,iLen+1);
-	std::string strPath = chRtn;
-	delete [] chRtn;
-	chRtn=NULL;
-	char fuldir[MAX_PATH]={0};
-	_fullpath(fuldir,strPath.c_str(),MAX_PATH);
-	return fuldir;    
-}
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/resource.h
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/resource.h
@ -1,10 +1,9 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by game.RC
+// Used by game.rc
 //
-
-#define IDS_PROJNAME                100
-#define IDR_TESTLUA    100
+#define IDS_PROJNAME                    100
+#define IDR_TESTLUA                     100
 #define IDR_MENU_COCOS                  201
 #define IDD_DIALOG1                     202
 #define IDD_DIALOG_ABOUT                202
@ -13,7 +12,7 @@
 #define IDC_EDIT2                       1001
 #define IDC_EDIT_HEIGHT                 1001
 #define ID_VIEW_SIZE                    30001
-#define ID_FILE_NEW_WINDOW            32771
+#define ID_FILE_NEW_WINDOW              32771
 #define ID_VIEW_PORTRAIT                32775
 #define ID_VIEW_LANDSCAPE               32776
 #define ID_VIEW_CUSTOM                  32777
@ -24,14 +23,18 @@
 #define ID_TEST_RESET                   32782
 #define ID_CONTROL                      32783
 #define ID_CONTROL_RELOAD               32784
+#define ID_VIEW_ZOOMOUT100              32785
+#define ID_VIEW_ZOOMOUT75               32786
+#define ID_VIEW_ZOOMOUT50               32787
+#define ID_VIEW_ZOOMOUT25               32788

 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_COMMAND_VALUE         32785
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32793
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
--- a/templates/lua-template-default/src/main.lua
+++ b/templates/lua-template-default/src/main.lua
@ -13,13 +13,13 @@ function __G__TRACKBACK__(msg)
 end

 local function main()
-
+    collectgarbage("collect")
    -- avoid memory leak
    collectgarbage("setpause", 100)
    collectgarbage("setstepmul", 5000)
 	cc.FileUtils:getInstance():addSearchResolutionsOrder("src");
 	cc.FileUtils:getInstance():addSearchResolutionsOrder("res");
-	
+	local schedulerID = 0
    --support debug
    local targetPlatform = cc.Application:getInstance():getTargetPlatform()
    if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or 
@ -76,7 +76,7 @@ local function main()
            spriteDog:setPositionX(x)
        end

-        cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false)
+        schedulerID = cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false)

        return spriteDog
    end
@ -148,6 +148,13 @@ local function main()
        listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED )
        local eventDispatcher = layerFarm:getEventDispatcher()
        eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm)
+        
+        local function onNodeEvent(event)
+           if "exit" == event then
+               cc.Director:getInstance():getScheduler():unscheduleScriptEntry(schedulerID)
+           end
+        end
+        layerFarm:registerScriptHandler(onNodeEvent)

        return layerFarm
    end
--- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
@ -0,0 +1,66 @@
+#include "AppDelegate.h"
+#include "CCLuaEngine.h"
+#include "SimpleAudioEngine.h"
+#include "cocos2d.h"
+#include "Runtime.h"
+
+using namespace CocosDenshion;
+
+USING_NS_CC;
+using namespace std;
+
+AppDelegate::AppDelegate()
+{
+}
+
+AppDelegate::~AppDelegate()
+{
+    SimpleAudioEngine::end();
+}
+
+bool AppDelegate::applicationDidFinishLaunching()
+{
+    // initialize director
+    auto director = Director::getInstance();
+	auto glview = director->getOpenGLView();
+	if(!glview) {
+		glview = GLView::createWithRect("HelloLua", Rect(0,0,900,640));
+		director->setOpenGLView(glview);
+	}
+
+    glview->setDesignResolutionSize(480, 320, ResolutionPolicy::NO_BORDER);
+
+    // turn on display FPS
+    director->setDisplayStats(true);
+
+    // set FPS. the default value is 1.0/60 if you don't call this
+    director->setAnimationInterval(1.0 / 60);
+
+    
+
+#ifdef COCOS2D_DEBUG
+	startRuntime();
+#else
+	auto engine = LuaEngine::getInstance();
+	ScriptEngineManager::getInstance()->setScriptEngine(engine);
+	engine->executeScriptFile("src/main.lua");
+#endif
+
+    return true;
+}
+
+// This function will be called when the app is inactive. When comes a phone call,it's be invoked too
+void AppDelegate::applicationDidEnterBackground()
+{
+    Director::getInstance()->stopAnimation();
+
+    SimpleAudioEngine::getInstance()->pauseBackgroundMusic();
+}
+
+// this function will be called when the app is active again
+void AppDelegate::applicationWillEnterForeground()
+{
+    Director::getInstance()->startAnimation();
+
+    SimpleAudioEngine::getInstance()->resumeBackgroundMusic();
+}
--- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp
@ -40,8 +40,10 @@ using namespace std;
 using namespace cocos2d;

 extern string getIPAddress();
-extern string getProjSearchPath();
-
+string getRuntimeVersion()
+{
+    return "0.0.1";
+}
 void startScript(string strDebugArg)
 {
    // register lua engine
@ -54,9 +56,14 @@ void startScript(string strDebugArg)
    engine->executeScriptFile("src/main.lua");
 }

-void reloadScript()
+void reloadScript(const string& modulefile)
 {
-    LuaEngine::getInstance()->reload("src/main.lua");
+	string strfile = modulefile;
+	if (strfile.empty())
+	{
+		strfile = "src/main.lua";
+	}
+    LuaEngine::getInstance()->reload(strfile.c_str());
 }


@ -462,9 +469,20 @@ void FileServer::loop()

 	// clean up: ignore stdin, stdout and stderr
 	for(const auto &fd: _fds )
+	{
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+		closesocket(fd);
+#else
 		close(fd);
-	close(_listenfd);
+#endif
+	}

+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+	closesocket(_listenfd);
+	WSACleanup();
+#else
+	close(_listenfd);
+#endif
 	_running = false;
 }

@ -480,14 +498,15 @@ public:
            {"shutdownapp","exit runtime app",std::bind(&ConsoleCustomCommand::onShutDownApp, this, std::placeholders::_1, std::placeholders::_2)},
            {"start-logic","run game logic script.Arg:[debugArg]",std::bind(&ConsoleCustomCommand::onRunLogicScript, this, std::placeholders::_1, std::placeholders::_2)},
            {"reload","reload script.Args:[filepath]",std::bind(&ConsoleCustomCommand::onReloadScriptFile, this, std::placeholders::_1, std::placeholders::_2)},
+            {"getversion","get runtime version.",std::bind(&ConsoleCustomCommand::onRuntimeVersion, this, std::placeholders::_1, std::placeholders::_2)},
        };
        for (int i=0;i< sizeof(commands)/sizeof(Console::Command);i++) {
            _console->addCommand(commands[i]);
        }
-        _console->listenOnTCP(5678);
+        _console->listenOnTCP(6001);
        
        _fileserver=new FileServer();
-        _fileserver->listenOnTCP(6666);
+        _fileserver->listenOnTCP(6002);
    }
    ~ConsoleCustomCommand()
    {
@ -509,11 +528,17 @@ public:
    
    void onReloadScriptFile(int fd,const std::string &args)
    {
-        Director::getInstance()->getScheduler()->performFunctionInCocosThread([](){
-             reloadScript();
+        Director::getInstance()->getScheduler()->performFunctionInCocosThread([=](){
+             reloadScript(args.c_str());
        });
    }
    
+    void onRuntimeVersion(int fd, const std::string &args)
+    {
+        string runtimeVer=getRuntimeVersion();
+        send(fd, runtimeVer.c_str(), runtimeVer.size(),0);
+    }
+    
    void onShutDownApp(int fd, const std::string &args)
    {
        Director::getInstance()->getScheduler()->performFunctionInCocosThread([](){
--- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h
@ -32,7 +32,7 @@ using namespace std;

 void startRuntime();

-void reloadScript();
+void reloadScript(const string& modulefile);

 // SimulatorConfig
 typedef struct _SimulatorScreenSize {
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.classpath
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.classpath
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.project
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.project
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>HelloLua</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.settings/org.eclipse.jdt.core.prefs
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml
@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.cocos2dx.hellolua"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+    <uses-sdk android:minSdkVersion="9"/>
+    <uses-feature android:glEsVersion="0x00020000" />
+
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/icon">
+
+        <activity android:name="org.cocos2dx.lua.Cocos2dxActivity"
+                  android:label="@string/app_name"
+                  android:screenOrientation="landscape"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                  android:configChanges="orientation">
+
+            <!-- Tell NativeActivity the name of our .so -->
+            <meta-data android:name="android.app.lib_name"
+                       android:value="cocos2dlua" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <supports-screens android:anyDensity="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:xlargeScreens="true"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>  
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>  
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>  
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>  
+    
+  	<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+ 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+</manifest> 
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/ant.properties
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/ant.properties
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build.xml
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="TestsDemo" default="help">
+<project name="HelloLua" default="debug">

    <!-- The local.properties file is created and updated by the 'android' tool.
         It contains the path to the SDK. It should *NOT* be checked into
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk
@ -0,0 +1,24 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cocos2dlua_shared
+
+LOCAL_MODULE_FILENAME := libcocos2dlua
+
+LOCAL_SRC_FILES := hellolua/main.cpp \
+				   hellolua/Runtime_android.cpp \
+                   ../../Classes/AppDelegate.cpp \
+                   ../../Classes/Runtime.cpp
+
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
+                    $(LOCAL_PATH)/../../cocos2d-x/external/lua/tolua
+					
+LOCAL_STATIC_LIBRARIES := curl_static_prebuilt
+
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,bindings)
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk
@ -0,0 +1,4 @@
+APP_STL := gnustl_static
+APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
+APP_CPPFLAGS += -fexceptions
+
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/hellolua/Runtime_android.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/hellolua/Runtime_android.cpp
@ -6,24 +6,6 @@
 using namespace std;
 using namespace cocos2d;

-string getSDCardPath();
-string getProjSearchPath()
-{
-	extern std::string getPackageNameJNI();
-	string searchPath = getSDCardPath();
-	searchPath += "/";
-	searchPath += getPackageNameJNI();
-	return searchPath;
-}
-
-vector<string> getSearchPath()
-{
-	extern std::string getPackageNameJNI();
-	vector<string> searchPathArray;
-	searchPathArray.push_back(getProjSearchPath());
-	return searchPathArray;
-}
-
 string getSDCardPath()
 {
 	JniMethodInfo t;
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/proguard-project.txt
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/proguard-project.txt
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties
@ -0,0 +1,13 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-10
+
+android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/res/values/strings.xml
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/res/values/strings.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">TestCpp</string>
+    <string name="app_name">HelloLua</string>
 </resources>
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java
@ -0,0 +1,88 @@
+package org.cocos2dx.lua;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+
+import android.app.NativeActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Bundle;
+import android.os.Environment;
+import android.provider.Settings;
+import android.util.Log;
+import android.widget.Toast;
+
+public class Cocos2dxActivity extends NativeActivity{
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		
+		//For supports translucency
+		
+		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
+		/*const EGLint attribs[] = {
+	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
+	            //EGL_BLUE_SIZE, 5,   -->delete 
+	            //EGL_GREEN_SIZE, 6,  -->delete 
+	            //EGL_RED_SIZE, 5,    -->delete 
+	            EGL_BUFFER_SIZE, 32,  //-->new field
+	            EGL_DEPTH_SIZE, 16,
+	            EGL_STENCIL_SIZE, 8,
+	            EGL_NONE
+	    };*/
+		
+		//2.Set the format of window
+		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
+		if(!isWifiConnected())
+		{
+			Toast.makeText(this, "wifi is closed!", Toast.LENGTH_SHORT).show();
+			startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
+		}
+	}
+	
+	 private boolean isWifiConnected() {  
+	        ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);  
+	        if (cm != null) {  
+	            NetworkInfo networkInfo = cm.getActiveNetworkInfo();  
+	            if (networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {  
+	                return true;  
+	            }  
+	        }  
+	        return false;  
+	    } 
+	 
+	public static String getLocalIpAddress() {
+		try {
+			for (Enumeration<NetworkInterface> en = NetworkInterface
+					.getNetworkInterfaces(); en.hasMoreElements();) {
+				NetworkInterface intf = en.nextElement();
+				for (Enumeration<InetAddress> enumIpAddr = intf
+						.getInetAddresses(); enumIpAddr.hasMoreElements();) {
+					InetAddress inetAddress = enumIpAddr.nextElement();
+					if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress()) {
+						return inetAddress.getHostAddress().toString();
+					}
+				}
+			}
+		} catch (SocketException ex) {
+			Log.e("WifiPreference IpAddress", ex.toString());
+		}
+		return null;
+	}
+	
+	public static String getSDCardPath() {
+		if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+			String strSDCardPathString = Environment.getExternalStorageDirectory().getPath();
+           return  strSDCardPathString;
+		}
+		return null;
+	}
+	
+}
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm
@ -7,21 +7,6 @@
 #include <vector>
 using namespace std;

-string getProjSearchPath()
-{
-    NSString *bundlePath = [[NSBundle mainBundle] resourcePath];
-    if (bundlePath != nil) {
-        return [bundlePath UTF8String];
-    }
-    return "";
-}
-
-vector<string> getSearchPath()
-{
-	vector<string> searchPathArray;
-	return searchPathArray;
-}
-
 string getIPAddress()
 {
    BOOL success;
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.h
@ -0,0 +1,35 @@
+/****************************************************************************
+ Copyright (c) 2010-2013 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+@class RootViewController;
+
+@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate>
+{
+    UIWindow *window;
+    RootViewController    *viewController;
+}
+
+@end
+
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
@ -0,0 +1,144 @@
+/****************************************************************************
+ Copyright (c) 2010-2013 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#import <UIKit/UIKit.h>
+#import "cocos2d.h"
+
+#import "AppController.h"
+#import "AppDelegate.h"
+#import "RootViewController.h"
+#import "CCEAGLView.h"
+
+@implementation AppController
+
+#pragma mark -
+#pragma mark Application lifecycle
+
+// cocos2d application instance
+static AppDelegate s_sharedApplication;
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+
+    // Override point for customization after application launch.
+
+    // Add the view controller's view to the window and display.
+    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
+    CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds]
+                                     pixelFormat: kEAGLColorFormatRGBA8
+                                     depthFormat: GL_DEPTH24_STENCIL8_OES
+                              preserveBackbuffer: NO
+                                      sharegroup: nil
+                                   multiSampling: NO
+                                 numberOfSamples: 0 ];
+
+    [eaglView setMultipleTouchEnabled:YES];
+    
+    // Use RootViewController manage CCEAGLView
+    viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil];
+    viewController.wantsFullScreenLayout = YES;
+    viewController.view = eaglView;
+
+    // Set RootViewController to window
+    if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0)
+    {
+        // warning: addSubView doesn't work on iOS6
+        [window addSubview: viewController.view];
+    }
+    else
+    {
+        // use this method on ios6
+        [window setRootViewController:viewController];
+    }
+    
+    [window makeKeyAndVisible];
+
+    [[UIApplication sharedApplication] setStatusBarHidden: YES];
+
+    // IMPORTANT: Setting the GLView should be done after creating the RootViewController
+    cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView);
+    cocos2d::Director::getInstance()->setOpenGLView(glview);
+
+    cocos2d::Application::getInstance()->run();
+    return YES;
+}
+
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+    /*
+     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+     */
+    cocos2d::Director::getInstance()->pause();
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+    /*
+     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+     */
+    cocos2d::Director::getInstance()->resume();
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    /*
+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
+     */
+    cocos2d::Application::getInstance()->applicationDidEnterBackground();
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+    /*
+     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
+     */
+    cocos2d::Application::getInstance()->applicationWillEnterForeground();
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+    /*
+     Called when the application is about to terminate.
+     See also applicationDidEnterBackground:.
+     */
+}
+
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+    /*
+     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
+     */
+     cocos2d::Director::getInstance()->purgeCachedData();
+}
+
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+
+@end
+
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch
@ -1,5 +1,5 @@
 //
-// Prefix header for all source files of the 'TestLua' target in the 'TestLua' project
+// Prefix header for all source files of the 'HelloLua' target in the 'HelloLua' project
 //

 #ifdef __OBJC__
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
@ -0,0 +1,105 @@
+/****************************************************************************
+ Copyright (c) 2010-2011 cocos2d-x.org
+ Copyright (c) 2010      Ricardo Quesada
+ 
+ http://www.cocos2d-x.org
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#import "RootViewController.h"
+#import "cocos2d.h"
+#import "CCEAGLView.h"
+
+@implementation RootViewController
+
+/*
+ // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
+        // Custom initialization
+    }
+    return self;
+}
+*/
+
+/*
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView {
+}
+*/
+
+/*
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+    [super viewDidLoad];
+}
+ 
+*/
+// Override to allow orientations other than the default portrait orientation.
+// This method is deprecated on ios6
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
+}
+
+// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
+- (NSUInteger) supportedInterfaceOrientations{
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
+}
+
+- (BOOL) shouldAutorotate {
+    return YES;
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+	[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+
+	CGSize s = CGSizeMake([[CCEAGLView sharedEGLView] getWidth], [[CCEAGLView sharedEGLView] getHeight]);
+
+	cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height);
+}
+
+//fix not hide status on ios7
+- (BOOL)prefersStatusBarHidden
+{
+    return YES;
+}
+
+- (void)didReceiveMemoryWarning {
+    // Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+    
+    // Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+
+@end
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m
@ -0,0 +1,16 @@
+//
+//  main.m
+//  HelloLua
+//
+//  Copyright __MyCompanyName__ 2011. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+int main(int argc, char *argv[]) {
+    
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
+    [pool release];
+    return retVal;
+}
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Icon.icns.REMOVED.git-id
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Icon.icns.REMOVED.git-id
@ -0,0 +1 @@
+2040fc6fe624353ae1d3db50cd3d450f4fda5afc
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Prefix.pch
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Prefix.pch
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
@ -65,7 +65,7 @@ using namespace cocos2d;
 {

    AppDelegate app;
-	[self createSimulator:[NSString stringWithUTF8String:"HelloJavascript"] viewWidth:960 viewHeight:640 factor:1.0];
+	[self createSimulator:[NSString stringWithUTF8String:"HelloLua"] viewWidth:960 viewHeight:640 factor:1.0];
    int ret = Application::getInstance()->run();
    
 }
@ -138,7 +138,7 @@ using namespace cocos2d;
        [itemLandscape setState:NSOffState];
    }

-    int scale = 100;
+    int scale = g_eglView->getFrameZoomFactor()*100;

    NSMenuItem *itemZoom100 = [menuScreen itemWithTitle:@"Actual (100%)"];
    NSMenuItem *itemZoom75 = [menuScreen itemWithTitle:@"Zoom Out (75%)"];
@ -194,14 +194,20 @@ using namespace cocos2d;

 - (void) updateView
 {
+    auto policy = g_eglView->getResolutionPolicy();
+    auto designSize = g_eglView->getDesignResolutionSize();
+    
 	if (g_landscape)
 	{
-		glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.width,g_screenSize.height);
+        g_eglView->setFrameSize(g_screenSize.width, g_screenSize.height);
 	}
 	else
 	{
-		glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.height,g_screenSize.width);
+        g_eglView->setFrameSize(g_screenSize.height, g_screenSize.width);
 	}
+    
+    g_eglView->setDesignResolutionSize(designSize.width, designSize.height, policy);
+    
    [self updateMenu];
 }

@ -255,7 +261,7 @@ using namespace cocos2d;

 - (IBAction) onReloadScript:(id)sender
 {
-    reloadScript();
+    reloadScript("");
 }


@ -276,7 +282,8 @@ using namespace cocos2d;
 {
    if ([sender state] == NSOnState) return;
    float scale = (float)[sender tag] / 100.0f;
-    [self setZoom:scale];
+    g_eglView->setFrameZoomFactor(scale);
+    [self updateView];
 }


--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm
@ -32,7 +32,7 @@ NSString* projectPath=nil;
    
    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
    [self.window makeFirstResponder:textFieldProjectDirectory];
-    if (projectPath)
+    if (nil != projectPath &&  0 != projectPath.length)
    {
        [textFieldProjectDirectory setStringValue:projectPath];
    }
@ -89,6 +89,8 @@ NSString* projectPath=nil;
        return;
    }
    projectPath =  [textFieldProjectDirectory stringValue];
+    [self close];
+    [NSApp endSheet:self.window returnCode:NSRunAbortedResponse];
 }


--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/main.m
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/main.m
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln
@ -0,0 +1,99 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
+	ProjectSection(ProjectDependencies) = postProject
+		{21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28}
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}
+		{DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159}
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
+	ProjectSection(ProjectDependencies) = postProject
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32
+		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32
+		{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32
+		{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32
+		{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32
+		{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32
+		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32
+		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32
+		{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32
+		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32
+		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32
+		{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32
+		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32
+		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32
+		{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
+		{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
+		{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32
+		{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32
+		{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32
+		{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32
+		{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32
+		{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32
+		{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}</ProjectGuid>
+    <ProjectName>HelloLua</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\cocos2d-x\cocos\2d\cocos2d_headers.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
+    <IntDir>$(Configuration).win32\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(IncludePath)</IncludePath>
+    <SourcePath>$(SourcePath);</SourcePath>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration).win32\</OutDir>
+    <IntDir>$(Configuration).win32\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <HeaderFileName>HelloLua.h</HeaderFileName>
+      <InterfaceIdentifierFileName>HelloLua_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>HelloLua_p.c</ProxyFileName>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <TypeLibraryName>$(IntDir)/HelloLua.tlb</TypeLibraryName>
+      <DllDataFileName>
+      </DllDataFileName>
+    </Midl>
+    <PreBuildEvent>
+      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
+if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
+mkdir "$(OutDir)\Resource"
+mkdir "$(OutDir)\Resource\src"
+mkdir "$(OutDir)\Resource\res"
+xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
+xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
+xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y</Command>
+      <Message>copy files</Message>
+    </PreBuildEvent>
+    <PreLinkEvent>
+      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
+xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
+    </PreLinkEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <HeaderFileName>HelloLua.h</HeaderFileName>
+      <InterfaceIdentifierFileName>HelloLua_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>HelloLua_p.c</ProxyFileName>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <TypeLibraryName>$(IntDir)/HelloLua.tlb</TypeLibraryName>
+      <DllDataFileName>
+      </DllDataFileName>
+    </Midl>
+    <PreBuildEvent>
+      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
+if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
+mkdir "$(OutDir)\Resource"
+mkdir "$(OutDir)\Resource\src"
+mkdir "$(OutDir)\Resource\res"
+xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
+xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
+xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y</Command>
+      <Message>copy files</Message>
+    </PreBuildEvent>
+    <PreLinkEvent>
+      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
+xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
+    </PreLinkEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Classes\AppDelegate.h" />
+    <ClInclude Include="..\Classes\Runtime.h" />
+    <ClInclude Include="main.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="SimulatorWindow.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Classes\AppDelegate.cpp" />
+    <ClCompile Include="..\Classes\Runtime.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="Runtime_win32.cpp" />
+    <ClCompile Include="SimulatorWindow.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="game.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj">
+      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj">
+      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
+      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
+      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+      <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj">
+      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj">
+      <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj">
+      <Project>{ddc3e27f-004d-4dd4-9dd3-931a013d2159}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
+      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj">
+      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj">
+      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\game.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters
@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Classes">
+      <UniqueIdentifier>{fc5cb953-2953-4968-83b3-39e3ff951754}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="win32">
+      <UniqueIdentifier>{037a9a02-b906-4cc5-ad98-304acd4e25ee}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="resource">
+      <UniqueIdentifier>{2d1d0979-58cd-4ab6-b91c-13650158f1fa}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Classes\AppDelegate.h">
+      <Filter>Classes</Filter>
+    </ClInclude>
+    <ClInclude Include="main.h">
+      <Filter>win32</Filter>
+    </ClInclude>
+    <ClInclude Include="SimulatorWindow.h">
+      <Filter>win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\Runtime.h">
+      <Filter>Classes</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Classes\AppDelegate.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="SimulatorWindow.cpp">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="Runtime_win32.cpp">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\Runtime.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="game.rc">
+      <Filter>resource</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\game.ico" />
+  </ItemGroup>
+</Project>
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>false</ShowAllFiles>
+    <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Resource</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Resource</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp
@ -0,0 +1,30 @@
+
+#include <io.h>
+#include <direct.h>
+#include <stdio.h>
+#include <vector>
+#include <string>
+
+#include "cocos2d.h"
+using namespace std;
+
+string getIPAddress()
+{
+	WSADATA wsaData;  
+	char name[155]={0};
+	char *ip=nullptr;
+	PHOSTENT hostinfo;
+
+	if ( WSAStartup( MAKEWORD(2,0), &wsaData ) == 0 )   
+	{  
+		if( gethostname ( name, sizeof(name)) == 0)   
+		{ 
+			if((hostinfo = gethostbyname(name)) != NULL)   
+			{ 
+				ip = inet_ntoa (*(struct in_addr *)*hostinfo->h_addr_list);
+			}   
+		}   
+		WSACleanup( );
+	}   
+	return ip;
+}
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp
@ -103,19 +103,49 @@ void updateMenu()
 		}
 		CheckMenuItem(viewMenu, i, MF_BYPOSITION | (bSel? MF_CHECKED : MF_UNCHECKED));
 	}
+
+	int scale=g_eglView->getFrameZoomFactor()*100;
+	CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT100, MF_BYCOMMAND | MF_UNCHECKED);
+	CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT75, MF_BYCOMMAND | MF_UNCHECKED);
+	CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT50, MF_BYCOMMAND | MF_UNCHECKED);
+	CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT25, MF_BYCOMMAND | MF_UNCHECKED);
+	switch (scale)
+	{
+	case 100:
+		CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT100, MF_BYCOMMAND | MF_CHECKED);
+		break;
+	case 75:
+		CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT75, MF_BYCOMMAND | MF_CHECKED);
+		break;
+	case 50:
+		CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT50, MF_BYCOMMAND | MF_CHECKED);
+		break;
+	case 25:
+		CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT25, MF_BYCOMMAND | MF_CHECKED);
+		break;
+	default:
+		break;
+	}
 }

 /*@brief updateView*/
 void updateView()
 {
+
+	auto policy = g_eglView->getResolutionPolicy();
+	auto designSize = g_eglView->getDesignResolutionSize();
+
 	if (g_landscape)
 	{
-		glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.width,g_screenSize.height);
+		g_eglView->setFrameSize(g_screenSize.width, g_screenSize.height);
 	}
 	else
 	{
-		glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.height,g_screenSize.width);
+		g_eglView->setFrameSize(g_screenSize.height, g_screenSize.width);
 	}
+
+	g_eglView->setDesignResolutionSize(designSize.width, designSize.height, policy);
+
 	updateMenu();
 }

@ -133,6 +163,30 @@ void onViewChangeOrientation(int viewMenuID)
 	}
 }

+void onViewZoomOut(int viewMenuID)
+{
+	float scale = 1.0;
+	switch (viewMenuID)
+	{
+	case ID_VIEW_ZOOMOUT100:
+		scale=1.0;
+		break;
+	case ID_VIEW_ZOOMOUT75:
+		scale=0.75;
+		break;
+	case ID_VIEW_ZOOMOUT50:
+		scale=0.50;
+		break;
+	case ID_VIEW_ZOOMOUT25:
+		scale=0.25;
+		break;
+	default:
+		break;
+	}
+	g_eglView->setFrameZoomFactor(scale);
+	updateView();
+}
+
 void onViewChangeFrameSize(int viewMenuID)
 {
 	int index = viewMenuID - ID_VIEW_SIZE;
@ -172,8 +226,15 @@ LRESULT CALLBACK SNewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar
 				onViewChangeOrientation(wmId);
 				break;

+			case ID_VIEW_ZOOMOUT100:
+			case ID_VIEW_ZOOMOUT75:
+			case ID_VIEW_ZOOMOUT50:
+			case ID_VIEW_ZOOMOUT25:
+				onViewZoomOut(wmId);
+				break;
+
 			case ID_CONTROL_RELOAD:
-				reloadScript();
+				reloadScript("");
 				break;

 			case ID_HELP_ABOUT:
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc
@ -0,0 +1,216 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Chinese (Simplified, PRC) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+#pragma code_page(936)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MENU_COCOS MENU
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM SEPARATOR
+        MENUITEM "E&xit",                       ID_FILE_EXIT
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM SEPARATOR
+        MENUITEM "&Portrait",                   ID_VIEW_PORTRAIT
+        MENUITEM "&Landscape",                  ID_VIEW_LANDSCAPE
+        MENUITEM SEPARATOR
+        MENUITEM "&Actual(100%)",               ID_VIEW_ZOOMOUT100
+        MENUITEM "Zoom Out(75%)",               ID_VIEW_ZOOMOUT75
+        MENUITEM "Zoom Out(50%)",               ID_VIEW_ZOOMOUT50
+        MENUITEM "Zoom Out(25%)",               ID_VIEW_ZOOMOUT25
+    END
+    POPUP "&Control"
+    BEGIN
+        MENUITEM "Reload",                      ID_CONTROL_RELOAD
+    END
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About ...",                  ID_HELP_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_DIALOG_ABOUT DIALOGEX 0, 0, 243, 94
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About Simulator"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,173,69,63,18
+    LTEXT           "Cocos2d-x-Simulator",IDC_STATIC,29,17,169,25
+END
+
+IDD_DIALOG_VIEWCUSTOM DIALOGEX 0, 0, 179, 98
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Custom"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,47,77,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,77,50,14
+    LTEXT           "Width£º",IDC_STATIC,15,14,30,8
+    LTEXT           "Height£º",IDC_STATIC,15,36,36,12
+    EDITTEXT        IDC_EDIT_WIDTH,60,15,89,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_HEIGHT,62,36,87,14,ES_AUTOHSCROLL
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_DIALOG_ABOUT, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 236
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 87
+    END
+
+    IDD_DIALOG_VIEWCUSTOM, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 172
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 91
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Chinese (Simplified, PRC) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+GLFW_ICON               ICON                    "res\\game.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "game Module"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "game"
+            VALUE "LegalCopyright", "Copyright "
+            VALUE "OriginalFilename", "game.exe"
+            VALUE "ProductName", "game Module"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp
@ -0,0 +1,59 @@
+#include "main.h"
+#include "AppDelegate.h"
+#include "cocos2d.h"
+#include "SimulatorWindow.h"
+
+USING_NS_CC;
+
+// uncomment below line, open debug console
+#define USE_WIN32_CONSOLE
+
+int APIENTRY _tWinMain(HINSTANCE hInstance,
+                       HINSTANCE hPrevInstance,
+                       LPTSTR    lpCmdLine,
+                       int       nCmdShow)
+{
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(lpCmdLine);
+
+#ifdef USE_WIN32_CONSOLE
+    AllocConsole();
+    freopen("CONIN$", "r", stdin);
+    freopen("CONOUT$", "w", stdout);
+    freopen("CONOUT$", "w", stderr);
+#endif
+
+    // create the application instance
+    AppDelegate app;
+	createSimulator("HelloLua",960,640);
+
+    int ret = Application::getInstance()->run();
+
+#ifdef USE_WIN32_CONSOLE
+    FreeConsole();
+#endif
+
+    return ret;
+}
+std::string getCurAppPath(void)
+{
+	TCHAR szAppDir[MAX_PATH]={0};
+	if (!GetModuleFileName(NULL,szAppDir,MAX_PATH))
+		return "";
+	int nEnd=0;
+	for (int i=0;szAppDir[i];i++)
+	{
+		if(szAppDir[i]=='\\')
+			nEnd = i;
+	}
+	szAppDir[nEnd] = 0;
+	int iLen = 2*wcslen(szAppDir);    
+	char* chRtn = new char[iLen+1];    
+	wcstombs(chRtn,szAppDir,iLen+1);
+	std::string strPath = chRtn;
+	delete [] chRtn;
+	chRtn=NULL;
+	char fuldir[MAX_PATH]={0};
+	_fullpath(fuldir,strPath.c_str(),MAX_PATH);
+	return fuldir;    
+}
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.h
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/res/game.ico
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/res/game.ico
--- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h
+++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h
@ -0,0 +1,40 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by game.rc
+//
+#define IDS_PROJNAME                    100
+#define IDR_TESTLUA                     100
+#define IDR_MENU_COCOS                  201
+#define IDD_DIALOG1                     202
+#define IDD_DIALOG_ABOUT                202
+#define IDD_DIALOG_VIEWCUSTOM           203
+#define IDC_EDIT_WIDTH                  1000
+#define IDC_EDIT2                       1001
+#define IDC_EDIT_HEIGHT                 1001
+#define ID_VIEW_SIZE                    30001
+#define ID_FILE_NEW_WINDOW              32771
+#define ID_VIEW_PORTRAIT                32775
+#define ID_VIEW_LANDSCAPE               32776
+#define ID_VIEW_CUSTOM                  32777
+#define ID_HELP_ABOUT                   32778
+#define ID_FILE_EXIT                    32779
+#define ID_Menu                         32780
+#define ID_Menu32781                    32781
+#define ID_TEST_RESET                   32782
+#define ID_CONTROL                      32783
+#define ID_CONTROL_RELOAD               32784
+#define ID_VIEW_ZOOMOUT100              32785
+#define ID_VIEW_ZOOMOUT75               32786
+#define ID_VIEW_ZOOMOUT50               32787
+#define ID_VIEW_ZOOMOUT25               32788
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        201
+#define _APS_NEXT_COMMAND_VALUE         32793
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
--- a/templates/lua-template-runtime/res/background.mp3.REMOVED.git-id
+++ b/templates/lua-template-runtime/res/background.mp3.REMOVED.git-id
--- a/templates/lua-template-runtime/res/farm.jpg.REMOVED.git-id
+++ b/templates/lua-template-runtime/res/farm.jpg.REMOVED.git-id
@ -0,0 +1 @@
+d7290c34702d1c6bdb368acb060d93b42d5deff8
--- a/templates/lua-template-runtime/runtime/ios/ios-sim
+++ b/templates/lua-template-runtime/runtime/ios/ios-sim
--- a/templates/lua-template-runtime/src/hello2.lua
+++ b/templates/lua-template-runtime/src/hello2.lua
@ -0,0 +1,3 @@
+function myadd(x, y)
+    return x + y
+end
--- a/templates/lua-template-runtime/src/main.lua
+++ b/templates/lua-template-runtime/src/main.lua
@ -0,0 +1,227 @@
+require "Cocos2d"
+-- cclog
+cclog = function(...)
+    print(string.format(...))
+end
+
+-- for CCLuaEngine traceback
+function __G__TRACKBACK__(msg)
+    cclog("----------------------------------------")
+    cclog("LUA ERROR: " .. tostring(msg) .. "\n")
+    cclog(debug.traceback())
+    cclog("----------------------------------------")
+end
+
+local function main()
+    collectgarbage("collect")
+    -- avoid memory leak
+    collectgarbage("setpause", 100)
+    collectgarbage("setstepmul", 5000)
+	cc.FileUtils:getInstance():addSearchResolutionsOrder("src");
+	cc.FileUtils:getInstance():addSearchResolutionsOrder("res");
+	local schedulerID = 0
+    --support debug
+    local targetPlatform = cc.Application:getInstance():getTargetPlatform()
+    if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or 
+       (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or
+       (cc.PLATFORM_OS_MAC == targetPlatform) then
+        cclog("result is ")
+		--require('debugger')()
+        
+    end
+    require "hello2"
+    cclog("result is " .. myadd(1, 1))
+
+    ---------------
+
+    local visibleSize = cc.Director:getInstance():getVisibleSize()
+    local origin = cc.Director:getInstance():getVisibleOrigin()
+
+    -- add the moving dog
+    local function creatDog()
+        local frameWidth = 105
+        local frameHeight = 95
+
+        -- create dog animate
+        local textureDog = cc.TextureCache:getInstance():addImage("dog.png")
+        local rect = cc.rect(0, 0, frameWidth, frameHeight)
+        local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect)
+        rect = cc.rect(frameWidth, 0, frameWidth, frameHeight)
+        local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect)
+
+        local spriteDog = cc.Sprite:createWithSpriteFrame(frame0)
+        spriteDog.isPaused = false
+        spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3)
+--[[
+        local animFrames = CCArray:create()
+
+        animFrames:addObject(frame0)
+        animFrames:addObject(frame1)
+]]--
+
+        local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5)
+        local animate = cc.Animate:create(animation);
+        spriteDog:runAction(cc.RepeatForever:create(animate))
+
+        -- moving dog at every frame
+        local function tick()
+            if spriteDog.isPaused then return end
+            local x, y = spriteDog:getPosition()
+            if x > origin.x + visibleSize.width then
+                x = origin.x
+            else
+                x = x + 1
+            end
+
+            spriteDog:setPositionX(x)
+        end
+
+        schedulerID = cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false)
+
+        return spriteDog
+    end
+
+    -- create farm
+    local function createLayerFarm()
+        local layerFarm = cc.Layer:create()
+
+        -- add in farm background
+        local bg = cc.Sprite:create("farm.jpg")
+        bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2)
+        layerFarm:addChild(bg)
+
+        -- add land sprite
+        for i = 0, 3 do
+            for j = 0, 1 do
+                local spriteLand = cc.Sprite:create("land.png")
+                spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2)
+                layerFarm:addChild(spriteLand)
+            end
+        end
+
+        -- add crop
+        local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95))
+        for i = 0, 3 do
+            for j = 0, 1 do
+                local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop);
+                spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2)
+                layerFarm:addChild(spriteCrop)
+            end
+        end
+
+        -- add moving dog
+        local spriteDog = creatDog()
+        layerFarm:addChild(spriteDog)
+
+        -- handing touch events
+        local touchBeginPoint = nil
+        local function onTouchBegan(touch, event)
+            local location = touch:getLocation()
+            cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y)
+            touchBeginPoint = {x = location.x, y = location.y}
+            spriteDog.isPaused = true
+            -- CCTOUCHBEGAN event must return true
+            return true
+        end
+
+        local function onTouchMoved(touch, event)
+            local location = touch:getLocation()
+            cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y)
+            if touchBeginPoint then
+                local cx, cy = layerFarm:getPosition()
+                layerFarm:setPosition(cx + location.x - touchBeginPoint.x,
+                                      cy + location.y - touchBeginPoint.y)
+                touchBeginPoint = {x = location.x, y = location.y}
+            end
+        end
+
+        local function onTouchEnded(touch, event)
+            local location = touch:getLocation()
+            cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y)
+            touchBeginPoint = nil
+            spriteDog.isPaused = false
+        end
+
+        local listener = cc.EventListenerTouchOneByOne:create()
+        listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN )
+        listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED )
+        listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED )
+        local eventDispatcher = layerFarm:getEventDispatcher()
+        eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm)
+        
+        local function onNodeEvent(event)
+           if "exit" == event then
+               cc.Director:getInstance():getScheduler():unscheduleScriptEntry(schedulerID)
+           end
+        end
+        layerFarm:registerScriptHandler(onNodeEvent)
+
+        return layerFarm
+    end
+
+
+    -- create menu
+    local function createLayerMenu()
+        local layerMenu = cc.Layer:create()
+
+        local menuPopup, menuTools, effectID
+
+        local function menuCallbackClosePopup()
+            -- stop test sound effect
+            cc.SimpleAudioEngine:getInstance():stopEffect(effectID)
+            menuPopup:setVisible(false)
+        end
+
+        local function menuCallbackOpenPopup()
+            -- loop test sound effect
+            local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav")
+            effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath)
+            menuPopup:setVisible(true)
+        end
+
+        -- add a popup menu
+        local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png")
+        menuPopupItem:setPosition(0, 0)
+        menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup)
+        menuPopup = cc.Menu:create(menuPopupItem)
+        menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2)
+        menuPopup:setVisible(false)
+        layerMenu:addChild(menuPopup)
+        
+        -- add the left-bottom "tools" menu to invoke menuPopup
+        local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png")
+        menuToolsItem:setPosition(0, 0)
+        menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup)
+        menuTools = cc.Menu:create(menuToolsItem)
+        local itemWidth = menuToolsItem:getContentSize().width
+        local itemHeight = menuToolsItem:getContentSize().height
+        menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2)
+        layerMenu:addChild(menuTools)
+
+        return layerMenu
+    end
+
+    -- play background music, preload effect
+
+    -- uncomment below for the BlackBerry version
+    -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg")
+    local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3")
+    cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true)
+    local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav")
+    cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath)
+
+    -- run
+    local sceneGame = cc.Scene:create()
+    sceneGame:addChild(createLayerFarm())
+    sceneGame:addChild(createLayerMenu())
+	
+	if cc.Director:getInstance():getRunningScene() then
+		cc.Director:getInstance():replaceScene(sceneGame)
+	else
+		cc.Director:getInstance():runWithScene(sceneGame)
+	end
+
+end
+
+
+xpcall(main, __G__TRACKBACK__)
--- a/tests/cpp-empty-test/CMakeLists.txt
+++ b/tests/cpp-empty-test/CMakeLists.txt
@ -0,0 +1,75 @@
+set(APP_NAME cpp-empty-test)
+
+if(QT)
+  set(PLATFORM_SRC
+    proj.qt/main.cpp
+  )
+elseif(ANDROID)
+  set(PLATFORM_SRC
+    proj.android/jni/hellocpp/main.cpp
+  )
+elseif(WIN32)
+  set(PLATFORM_SRC
+    proj.win32/main.cpp
+  )
+elseif(APPLE)
+  if(IOS)
+    set(PLATFORM_SRC
+      proj.ios/main.m
+	  proj.ios/AppController.mm
+	  proj.ios/RootViewController.mm
+    )
+  else()
+    set(PLATFORM_SRC
+      proj.mac/main.m
+    )
+  endif()
+else()
+  set(PLATFORM_SRC
+    proj.linux/main.cpp
+  )
+  endif()
+
+set(SAMPLE_SRC
+  ${PLATFORM_SRC}
+  Classes/AppDelegate.cpp
+  Classes/HelloWorldScene.cpp
+)
+
+# add the executable
+add_executable(${APP_NAME}
+  ${SAMPLE_SRC}
+)
+
+if(WIN32 AND MSVC)
+  #get our resources
+  add_custom_command(TARGET ${APP_NAME} PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E copy_directory
+                         ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${CMAKE_CURRENT_BINARY_DIR})
+  #get our dlls
+  add_custom_command(TARGET ${APP_NAME} PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E copy
+                     ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/win32-specific/gles/prebuilt/glew32.dll 
+					 ${CMAKE_CURRENT_BINARY_DIR})
+
+  add_custom_command(TARGET ${APP_NAME} PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E copy
+                     ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/win32-specific/zlib/prebuilt/zlib1.dll 
+					 ${CMAKE_CURRENT_BINARY_DIR}/Debug)
+
+  #Visual Studio Defaults to wrong type
+  set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
+  set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+else()
+  set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}")
+
+  set_target_properties(${APP_NAME} PROPERTIES
+       RUNTIME_OUTPUT_DIRECTORY  "${APP_BIN_DIR}")
+
+  pre_build(${APP_NAME}
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources
+    )
+endif()
+
+target_link_libraries(${APP_NAME} audio cocos2d)
--- a/Show More
+++ b/Show More