Merge branch 'master' of https://github.com/okamstudio/godot

5 files changed, 400 insertions, 110 deletions

diff --git a/tools/editor/icons/SCsub b/tools/editor/icons/SCsub
index a7e550feac..aea053d22b 100644
--- a/tools/editor/icons/SCsub
+++ b/tools/editor/icons/SCsub
@@ -3,13 +3,15 @@ Import('env')
 def make_editor_icons_action(target, source, env):
 
 	import os
+	import cStringIO
 
 	dst = target[0].srcnode().abspath
 	pixmaps = source
+
+	s = cStringIO.StringIO()
 	
-	f = open(dst,"wb")
-	f.write("#include \"editor_icons.h\"\n\n")
-	f.write("#include \"scene/resources/theme.h\"\n\n")
+	s.write("#include \"editor_icons.h\"\n\n")
+	s.write("#include \"scene/resources/theme.h\"\n\n")
 
 	for x in pixmaps:
 	
@@ -17,37 +19,41 @@ def make_editor_icons_action(target, source, env):
 		var_str=os.path.basename(x)[:-4]+"_png";
 		#print(var_str)
 		
-		f.write("static const unsigned char "+ var_str +"[]={\n");
+		s.write("static const unsigned char "+ var_str +"[]={\n");
 		
 		pngf=open(x,"rb");
 		
 		b=pngf.read(1);
 		while(len(b)==1):
-			f.write(hex(ord(b)))
+			s.write(hex(ord(b)))
 			b=pngf.read(1);
 			if (len(b)==1):
-				f.write(",")
+				s.write(",")
 				
-		f.write("\n};\n\n\n");
+		s.write("\n};\n\n\n");
 		pngf.close();
 	  
-	f.write("static Ref<ImageTexture> make_icon(const uint8_t* p_png) {\n")
-	f.write("\tRef<ImageTexture> texture( memnew( ImageTexture ) );\n")
-	f.write("\ttexture->create_from_image( Image(p_png),ImageTexture::FLAG_FILTER );\n")
-	f.write("\treturn texture;\n")
-	f.write("}\n\n")
+	s.write("static Ref<ImageTexture> make_icon(const uint8_t* p_png) {\n")
+	s.write("\tRef<ImageTexture> texture( memnew( ImageTexture ) );\n")
+	s.write("\ttexture->create_from_image( Image(p_png),ImageTexture::FLAG_FILTER );\n")
+	s.write("\treturn texture;\n")
+	s.write("}\n\n")
 
-	f.write("void editor_register_icons(Ref<Theme> p_theme) {\n\n")
+	s.write("void editor_register_icons(Ref<Theme> p_theme) {\n\n")
 
 	for x in pixmaps:
 	
 		x=os.path.basename(str(x))
 		type=x[5:-4].title().replace("_","");
 		var_str=x[:-4]+"_png";
-		f.write("\tp_theme->set_icon(\""+type+"\",\"EditorIcons\",make_icon("+var_str+"));\n");
+		s.write("\tp_theme->set_icon(\""+type+"\",\"EditorIcons\",make_icon("+var_str+"));\n");
 
-	f.write("\n\n}\n\n");
+	s.write("\n\n}\n\n");
+	
+	f = open(dst,"wb")
+	f.write(s.getvalue())
 	f.close()
+	s.close()
 
 make_editor_icons_builder = Builder(action=make_editor_icons_action,
 							suffix = '.cpp',
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index c45e7441b8..bd8f1641e2 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -98,22 +98,21 @@ class NewProjectDialog : public ConfirmationDialog {
 
 	void _path_text_changed(const String& p_path) {
 
-		_test_path();
-		if (import_mode) {
+		if ( _test_path() ) {
 
 			String sp=p_path;
 
 			sp=sp.replace("\\","/");
 			int lidx=sp.find_last("/");
+
 			if (lidx!=-1) {
 				sp=sp.substr(lidx+1,sp.length());
 			}
-			if (sp=="")
+			if (sp=="" && import_mode )
 				sp="Imported Project";
 
 			project_name->set_text(sp);
 		}
-
 	}
 
 	void _file_selected(const String& p_path) {
@@ -338,21 +337,23 @@ struct ProjectItem {
 	String path;
 	String conf;
 	uint64_t last_modified;
+	bool favorite;
 	ProjectItem() {}
-	ProjectItem(const String &p_project, const String &p_path, const String &p_conf, uint64_t p_last_modified) {
-		project = p_project; path = p_path; conf = p_conf; last_modified = p_last_modified;
+	ProjectItem(const String &p_project, const String &p_path, const String &p_conf, uint64_t p_last_modified, bool p_favorite=false) {
+		project = p_project; path = p_path; conf = p_conf; last_modified = p_last_modified; favorite=p_favorite;
 	}
 	_FORCE_INLINE_ bool operator <(const ProjectItem& l) const { return last_modified > l.last_modified; }
+	_FORCE_INLINE_ bool operator ==(const ProjectItem& l) const { return project==l.project; }
 };
 
+
 void ProjectManager::_panel_draw(Node *p_hb) {
 
 	HBoxContainer *hb = p_hb->cast_to<HBoxContainer>();
 
 	hb->draw_line(Point2(0,hb->get_size().y+1),Point2(hb->get_size().x-10,hb->get_size().y+1),get_color("guide_color","Tree"));
 
-	if (hb->get_meta("name")==selected) {
-
+	if (selected_list.has(hb->get_meta("name"))) {
 		hb->draw_style_box(get_stylebox("selected","Tree"),Rect2(Point2(),hb->get_size()-Size2(10,0)));
 	}
 }
@@ -361,20 +362,90 @@ void ProjectManager::_panel_input(const InputEvent& p_ev,Node *p_hb) {
 
 	if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
 
-		selected = p_hb->get_meta("name");
-		selected_main = p_hb->get_meta("main_scene");
+		String clicked = p_hb->get_meta("name");
+		String clicked_main_scene = p_hb->get_meta("main_scene");
+
+		if (p_ev.key.mod.shift && selected_list.size()>0 && last_clicked!="" && clicked != last_clicked) {
+
+			int clicked_id = -1;
+			int last_clicked_id = -1;
+			for(int i=0;i<scroll_childs->get_child_count();i++) {
+				HBoxContainer *hb = scroll_childs->get_child(i)->cast_to<HBoxContainer>();
+				if (!hb) continue;
+				if (hb->get_meta("name") == clicked) clicked_id = i;
+				if (hb->get_meta("name") == last_clicked) last_clicked_id = i;
+			}
+
+			if (last_clicked_id!=-1 && clicked_id!=-1) {
+				int min = clicked_id < last_clicked_id? clicked_id : last_clicked_id;
+				int max = clicked_id > last_clicked_id? clicked_id : last_clicked_id;
+				for(int i=0; i<scroll_childs->get_child_count(); ++i) {
+					HBoxContainer *hb = scroll_childs->get_child(i)->cast_to<HBoxContainer>();
+					if (!hb) continue;
+					if (i!=clicked_id && (i<min || i>max) && !p_ev.key.mod.control) {
+						selected_list.erase(hb->get_meta("name"));
+					} else if (i>=min && i<=max) {
+						selected_list.insert(hb->get_meta("name"), hb->get_meta("main_scene"));
+					}
+				}
+			}
+
+		} else if (selected_list.has(clicked) && p_ev.key.mod.control) {
+
+			selected_list.erase(clicked);
+
+		} else {
+
+			last_clicked = clicked;
+			if (p_ev.key.mod.control || selected_list.size()==0) {
+				selected_list.insert(clicked, clicked_main_scene);
+			} else {
+				selected_list.clear();
+				selected_list.insert(clicked, clicked_main_scene);
+			}
+		}
+
+		String single_selected = "";
+		if (selected_list.size() == 1) {
+			single_selected = selected_list.front()->key();
+		}
+
+		single_selected_main = "";
 		for(int i=0;i<scroll_childs->get_child_count();i++) {
-			scroll_childs->get_child(i)->cast_to<CanvasItem>()->update();
+			CanvasItem *item = scroll_childs->get_child(i)->cast_to<CanvasItem>();
+			item->update();
+
+			if (single_selected!="" && single_selected == item->get_meta("name"))
+				single_selected_main = item->get_meta("main_scene");
 		}
-		erase_btn->set_disabled(false);
-		open_btn->set_disabled(false);
-		run_btn->set_disabled(selected_main=="");
+
+		erase_btn->set_disabled(selected_list.size()<1);
+		open_btn->set_disabled(selected_list.size()<1);
+		run_btn->set_disabled(selected_list.size()<1 || (selected_list.size()==1 && single_selected_main==""));
 
 		if (p_ev.mouse_button.doubleclick)
 			_open_project(); //open if doubleclicked
+
+	}
+}
+
+void ProjectManager::_favorite_pressed(Node *p_hb) {
+
+	String clicked = p_hb->get_meta("name");
+	bool favorite = !p_hb->get_meta("favorite");
+	String proj=clicked.replace(":::",":/");
+	proj=proj.replace("::","/");
+
+	if (favorite) {
+		EditorSettings::get_singleton()->set("favorite_projects/"+clicked,proj);
+	} else {
+		EditorSettings::get_singleton()->erase("favorite_projects/"+clicked);
 	}
+	EditorSettings::get_singleton()->save();
+	_load_recent_projects();
 }
 
+
 void ProjectManager::_load_recent_projects() {
 
 	while(scroll_childs->get_child_count()>0) {
@@ -387,12 +458,14 @@ void ProjectManager::_load_recent_projects() {
 	Color font_color = get_color("font_color","Tree");
 
 	List<ProjectItem> projects;
+	List<ProjectItem> favorite_projects;
 
 	for(List<PropertyInfo>::Element *E=properties.front();E;E=E->next()) {
 
 		String _name = E->get().name;
-		if (!_name.begins_with("projects/"))
+		if (!_name.begins_with("projects/") && !_name.begins_with("favorite_projects/"))
 			continue;
+		bool favorite = (_name.begins_with("favorite_projects/"))?true:false;
 
 		String project = _name.get_slice("/",1);
 		String path = EditorSettings::get_singleton()->get(_name);
@@ -408,11 +481,27 @@ void ProjectManager::_load_recent_projects() {
 				last_modified = cache_modified;
 		}
 
-		ProjectItem item(project, path, conf, last_modified);
-		projects.push_back(item);
+		ProjectItem item(project, path, conf, last_modified, favorite);
+		if (favorite)
+			favorite_projects.push_back(item);
+		else
+			projects.push_back(item);
 	}
 
 	projects.sort();
+	favorite_projects.sort();
+
+	for(List<ProjectItem>::Element *E=projects.front();E;) {
+		List<ProjectItem>::Element *next = E->next();
+		if (favorite_projects.find(E->get()) != NULL)
+			projects.erase(E->get());
+		E=next;
+	}
+	for(List<ProjectItem>::Element *E=favorite_projects.back();E;E=E->prev()) {
+		projects.push_front(E->get());
+	}
+
+	Ref<Texture> favorite_icon = get_icon("Favorites","EditorIcons");
 
 	for(List<ProjectItem>::Element *E=projects.front();E;E=E->next()) {
 
@@ -420,6 +509,7 @@ void ProjectManager::_load_recent_projects() {
 		String project = item.project;
 		String path = item.path;
 		String conf = item.conf;
+		bool is_favorite = item.favorite;
 
 		Ref<ConfigFile> cf = memnew( ConfigFile );
 		Error err = cf->load(conf);
@@ -428,7 +518,6 @@ void ProjectManager::_load_recent_projects() {
 		Ref<Texture> icon;
 		String project_name="Unnamed Project";
 
-
 		if (cf->has_section_key("application","icon")) {
 			String appicon = cf->get_value("application","icon");
 			if (appicon!="") {
@@ -457,15 +546,27 @@ void ProjectManager::_load_recent_projects() {
 			main_scene = cf->get_value("application","main_scene");
 		}
 
-
 		HBoxContainer *hb = memnew( HBoxContainer );
 		hb->set_meta("name",project);
 		hb->set_meta("main_scene",main_scene);
+		hb->set_meta("favorite",is_favorite);
 		hb->connect("draw",this,"_panel_draw",varray(hb));
 		hb->connect("input_event",this,"_panel_input",varray(hb));
+
+		VBoxContainer *favorite_box = memnew( VBoxContainer );
+		TextureButton *favorite = memnew( TextureButton );
+		favorite->set_normal_texture(favorite_icon);
+		if (!is_favorite)
+			favorite->set_opacity(0.2);
+		favorite->set_v_size_flags(SIZE_EXPAND);
+		favorite->connect("pressed",this,"_favorite_pressed",varray(hb));
+		favorite_box->add_child(favorite);
+		hb->add_child(favorite_box);
+
 		TextureFrame *tf = memnew( TextureFrame );
 		tf->set_texture(icon);
 		hb->add_child(tf);
+
 		VBoxContainer *vb = memnew(VBoxContainer);
 		hb->add_child(vb);
 		EmptyControl *ec = memnew( EmptyControl );
@@ -483,68 +584,92 @@ void ProjectManager::_load_recent_projects() {
 		scroll_childs->add_child(hb);
 	}
 
-	erase_btn->set_disabled(selected=="");
-	open_btn->set_disabled(selected=="");
-	if (selected=="")
-		run_btn->set_disabled(true);
+	erase_btn->set_disabled(selected_list.size()<1);
+	open_btn->set_disabled(selected_list.size()<1);
+	run_btn->set_disabled(selected_list.size()<1 || (selected_list.size()==1 && single_selected_main==""));
 }
 
-void ProjectManager::_open_project() {
-
+void ProjectManager::_open_project_confirm() {
 
-	if (selected=="") {
-		return;
-	}
+	for (Map<String,String>::Element *E=selected_list.front(); E; E=E->next()) {
+		const String &selected = E->key();
+		String path = EditorSettings::get_singleton()->get("projects/"+selected);
+		print_line("OPENING: "+path+" ("+selected+")");
 
-	String path = EditorSettings::get_singleton()->get("projects/"+selected);
-	print_line("OPENING: "+path+" ("+selected+")");
+		List<String> args;
 
-	List<String> args;
+		args.push_back("-path");
+		args.push_back(path);
 
+		args.push_back("-editor");
 
-	args.push_back("-path");
-	args.push_back(path);
+		const String &selected_main = E->get();
+		if (selected_main!="") {
+			args.push_back(selected_main);
+		}
 
-	args.push_back("-editor");
+		String exec = OS::get_singleton()->get_executable_path();
 
-	if (selected_main!="") {
-		args.push_back(selected_main);
+		OS::ProcessID pid=0;
+		Error err = OS::get_singleton()->execute(exec,args,false,&pid);
+		ERR_FAIL_COND(err);
 	}
 
-	String exec = OS::get_singleton()->get_executable_path();
+	get_scene()->quit();
+}
 
-	OS::ProcessID pid=0;
-	Error err = OS::get_singleton()->execute(exec,args,false,&pid);
-	ERR_FAIL_COND(err);
+void ProjectManager::_open_project() {
 
-	get_scene()->quit();
+	if (selected_list.size()<1) {
+		return;
+	}
 
+	if (selected_list.size()>1) {
+		multi_open_ask->set_text("Are you sure to open more than one projects?");
+		multi_open_ask->popup_centered(Size2(300,100));
+	} else {
+		_open_project_confirm();
+	}
 }
 
-void ProjectManager::_run_project() {
+void ProjectManager::_run_project_confirm() {
 
+	for (Map<String,String>::Element *E=selected_list.front(); E; E=E->next()) {
 
-	if (selected=="") {
-		return;
-	}
+		const String &selected_main = E->get();
+		if (selected_main == "") continue;
 
-	String path = EditorSettings::get_singleton()->get("projects/"+selected);
-	print_line("OPENING: "+path+" ("+selected+")");
+		const String &selected = E->key();
+		String path = EditorSettings::get_singleton()->get("projects/"+selected);
+		print_line("OPENING: "+path+" ("+selected+")");
 
-	List<String> args;
+		List<String> args;
 
+		args.push_back("-path");
+		args.push_back(path);
 
-	args.push_back("-path");
-	args.push_back(path);
+		String exec = OS::get_singleton()->get_executable_path();
 
-	String exec = OS::get_singleton()->get_executable_path();
+		OS::ProcessID pid=0;
+		Error err = OS::get_singleton()->execute(exec,args,false,&pid);
+		ERR_FAIL_COND(err);
+	}
+	//	get_scene()->quit(); do not quit
+}
+
+void ProjectManager::_run_project() {
 
-	OS::ProcessID pid=0;
-	Error err = OS::get_singleton()->execute(exec,args,false,&pid);
-	ERR_FAIL_COND(err);
 
-//	get_scene()->quit(); do not quit
+	if (selected_list.size()<1) {
+		return;
+	}
 
+	if (selected_list.size()>1) {
+		multi_run_ask->set_text("Are you sure to run more than one projects?");
+		multi_run_ask->popup_centered(Size2(300,100));
+	} else {
+		_run_project_confirm();
+	}
 }
 
 void ProjectManager::_scan_dir(DirAccess *da,float pos, float total,List<String> *r_projects) {
@@ -619,21 +744,24 @@ void ProjectManager::_import_project()  {
 
 void ProjectManager::_erase_project_confirm()  {
 
-	if (selected=="") {
+	if (selected_list.size()==0) {
 		return;
 	}
-
-	EditorSettings::get_singleton()->erase("projects/"+selected);
+	for (Map<String,String>::Element *E=selected_list.front(); E; E=E->next()) {
+		EditorSettings::get_singleton()->erase("projects/"+E->key());
+		EditorSettings::get_singleton()->erase("favorite_projects/"+E->key());
+	}
 	EditorSettings::get_singleton()->save();
-	selected="";
-	selected_main="";
+	selected_list.clear();
+	last_clicked = "";
+	single_selected_main="";
 	_load_recent_projects();
 
 }
 
 void ProjectManager::_erase_project()  {
 
-	if (selected=="")
+	if (selected_list.size()==0)
 		return;
 
 
@@ -651,7 +779,9 @@ void ProjectManager::_exit_dialog()  {
 void ProjectManager::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_open_project",&ProjectManager::_open_project);
+	ObjectTypeDB::bind_method("_open_project_confirm",&ProjectManager::_open_project_confirm);
 	ObjectTypeDB::bind_method("_run_project",&ProjectManager::_run_project);
+	ObjectTypeDB::bind_method("_run_project_confirm",&ProjectManager::_run_project_confirm);
 	ObjectTypeDB::bind_method("_scan_projects",&ProjectManager::_scan_projects);
 	ObjectTypeDB::bind_method("_scan_begin",&ProjectManager::_scan_begin);
 	ObjectTypeDB::bind_method("_import_project",&ProjectManager::_import_project);
@@ -662,6 +792,8 @@ void ProjectManager::_bind_methods() {
 	ObjectTypeDB::bind_method("_load_recent_projects",&ProjectManager::_load_recent_projects);
 	ObjectTypeDB::bind_method("_panel_draw",&ProjectManager::_panel_draw);
 	ObjectTypeDB::bind_method("_panel_input",&ProjectManager::_panel_input);
+	ObjectTypeDB::bind_method("_favorite_pressed",&ProjectManager::_favorite_pressed);
+
 
 }
 
@@ -712,7 +844,7 @@ ProjectManager::ProjectManager() {
 	scroll->set_enable_h_scroll(false);
 
 	VBoxContainer *tree_vb = memnew( VBoxContainer);
-	tree_hb->add_child(tree_vb);	
+	tree_hb->add_child(tree_vb);
 	scroll_childs = memnew( VBoxContainer );
 	scroll_childs->set_h_size_flags(SIZE_EXPAND_FILL);
 	scroll->add_child(scroll_childs);
@@ -792,6 +924,18 @@ ProjectManager::ProjectManager() {
 
 	add_child(erase_ask);
 
+	multi_open_ask = memnew( ConfirmationDialog );
+	multi_open_ask->get_ok()->set_text("Edit");
+	multi_open_ask->get_ok()->connect("pressed", this, "_open_project_confirm");
+
+	add_child(multi_open_ask);
+
+	multi_run_ask = memnew( ConfirmationDialog );
+	multi_run_ask->get_ok()->set_text("Run");
+	multi_run_ask->get_ok()->connect("pressed", this, "_run_project_confirm");
+
+	add_child(multi_run_ask);
+
 	OS::get_singleton()->set_low_processor_usage_mode(true);
 
 	npdialog = memnew( NewProjectDialog );
@@ -806,6 +950,7 @@ ProjectManager::ProjectManager() {
 	//get_ok()->set_text("Open");
 	//get_ok()->set_text("Exit");
 
+	last_clicked = "";
 }
 
 
diff --git a/tools/editor/project_manager.h b/tools/editor/project_manager.h
index b3ad106cd8..eebfc56a66 100644
--- a/tools/editor/project_manager.h
+++ b/tools/editor/project_manager.h
@@ -46,11 +46,14 @@ class ProjectManager : public Control {
 	FileDialog *scan_dir;
 
 	ConfirmationDialog *erase_ask;
+	ConfirmationDialog *multi_open_ask;
+	ConfirmationDialog *multi_run_ask;
 	NewProjectDialog *npdialog;
 	ScrollContainer *scroll;
 	VBoxContainer *scroll_childs;
-	String selected;
-	String selected_main;
+	Map<String, String> selected_list; // name -> main_scene
+	String last_clicked;
+	String single_selected_main;
 	bool importing;
 
 	void _item_doubleclicked();
@@ -59,7 +62,9 @@ class ProjectManager : public Control {
 
 	void _scan_projects();
 	void _run_project();
+	void _run_project_confirm();
 	void _open_project();
+	void _open_project_confirm();
 	void _import_project();
 	void _new_project();
 	void _erase_project();
@@ -72,6 +77,7 @@ class ProjectManager : public Control {
 
 	void _panel_draw(Node *p_hb);
 	void _panel_input(const InputEvent& p_ev,Node *p_hb);
+	void _favorite_pressed(Node *p_hb);
 
 protected:
 
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index 86331faa1d..bc0d48367a 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -37,12 +37,14 @@
 
 bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir) {
 
+	String search_term = tree_filter->get_search_term();
+	String file_filter = tree_filter->get_file_filter();
+
 	TreeItem *item = tree->create_item(p_parent);
 	item->set_text(0,p_dir->get_name()+"/");
 	item->set_icon(0,get_icon("Folder","EditorIcons"));
 	item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
 
-
 	bool has_items=false;
 
 	for(int i=0;i<p_dir->get_subdir_count();i++) {
@@ -53,6 +55,15 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 
 	for (int i=0;i<p_dir->get_file_count();i++) {
 
+		String file_name = p_dir->get_file(i);
+		String extension = file_name.extension();
+
+		if (search_term!="" && file_name.findn(search_term)==-1)
+			continue;
+
+		if (file_filter!="*" && extension != file_filter )
+			continue;
+
 		bool isfave = favorites.has(p_dir->get_file_path(i));
 		if (button_favorite->is_pressed() && !isfave)
 			continue;
@@ -61,7 +72,7 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 		fitem->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
 		fitem->set_editable(0,true);
 		fitem->set_checked(0,isfave);
-		fitem->set_text(0,p_dir->get_file(i));
+		fitem->set_text(0,file_name);
 
 		Ref<Texture> icon = get_icon( (has_icon(p_dir->get_file_type(i),"EditorIcons")?p_dir->get_file_type(i):String("Object")),"EditorIcons");
 		fitem->set_icon(0, icon );
@@ -251,45 +262,40 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 
 	editor=p_editor;
 
-	tree = memnew( Tree );
-	add_child(tree);
-	tree->set_area_as_parent_rect();
-	tree->set_anchor_and_margin(MARGIN_TOP,Control::ANCHOR_BEGIN,25);
-	tree->connect("item_edited",this,"_favorite_toggled");
-
+	HBoxContainer *toolbar_hbc = memnew( HBoxContainer );
+	add_child(toolbar_hbc);
 
 	button_reload = memnew( Button );
-	button_reload->set_pos(Point2(3,2));
-	button_reload->set_size(Point2(20,5));
 	button_reload->set_flat(true);
-	add_child(button_reload);
-	button_reload->connect("pressed",this,"_rescan");
+	button_reload->connect("pressed",this,"_rescan");	
+	toolbar_hbc->add_child(button_reload);
 
 	button_favorite = memnew( Button );
-	button_favorite->set_pos(Point2(28,2));
-	button_favorite->set_size(Point2(20,5));
 	button_favorite->set_flat(true);
 	button_favorite->set_toggle_mode(true);
-	add_child(button_favorite);
 	button_favorite->connect("toggled",this,"_favorites_toggled");
+	toolbar_hbc->add_child(button_favorite);
 
-	button_instance = memnew( Button );
-	button_instance->set_anchor(MARGIN_LEFT,ANCHOR_END);
-	button_instance->set_anchor(MARGIN_RIGHT,ANCHOR_END);
-	button_instance->set_begin(Point2(3+20,2));
-	button_instance->set_end(Point2(2+15,5));
-	button_instance->set_flat(true);
-	add_child(button_instance);
-	button_instance->connect("pressed",this,"_instance_pressed");
+	toolbar_hbc->add_spacer();
 
 	button_open = memnew( Button );
-	button_open->set_anchor(MARGIN_LEFT,ANCHOR_END);
-	button_open->set_anchor(MARGIN_RIGHT,ANCHOR_END);
-	button_open->set_begin(Point2(3+45,2));
-	button_open->set_end(Point2(2+34,5));
 	button_open->set_flat(true);
-	add_child(button_open);
 	button_open->connect("pressed",this,"_open_pressed");
+	toolbar_hbc->add_child(button_open);
+
+	button_instance = memnew( Button );
+	button_instance->set_flat(true);
+	button_instance->connect("pressed",this,"_instance_pressed");
+	toolbar_hbc->add_child(button_instance);
+
+	tree = memnew( Tree );
+	tree_filter=memnew( ScenesDockFilter(tree) );
+	tree_filter->connect("filter_changed", this, "_update_tree");
+	add_child(tree_filter);
+	add_child(tree);
+
+	tree->set_v_size_flags(SIZE_EXPAND_FILL);
+	tree->connect("item_edited",this,"_favorite_toggled");
 
 	timer = memnew( Timer );
 	timer->set_one_shot(true);
@@ -300,10 +306,102 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 
 	updating_tree=false;
 
+}
 
+ScenesDock::~ScenesDock() {
 
 }
 
-ScenesDock::~ScenesDock() {
+void ScenesDockFilter::_setup_filters() {
+
+	file_filter->clear();
 
+	List<String> extensions;
+	ResourceLoader::get_recognized_extensions_for_type("",&extensions);
+
+	file_filter->add_item("All Files (*)");
+	filters.push_back("*");
+
+	List<String> filter_texts;
+	for(int i=0;i<extensions.size();i++) {
+		filter_texts.push_back("*."+extensions[i]+" ; "+extensions[i].to_upper());
+		filters.push_back(extensions[i]);
+	}
+	for(int i=0;i<filter_texts.size();i++) {
+
+		String flt=filter_texts[i].get_slice(";",0).strip_edges();
+		String desc=filter_texts[i].get_slice(";",1).strip_edges();
+		if (desc.length())
+			file_filter->add_item(desc+" ( "+flt+" )");
+		else
+			file_filter->add_item("( "+flt+" )");
+	}
+}
+
+void ScenesDockFilter::_command(int p_command) {
+	switch (p_command) {
+
+		case CMD_CLEAR_FILTER: {
+			if (search_box->get_text()!="") {
+				search_box->clear();
+				emit_signal("filter_changed");
+			}
+		}break;
+	}
+}
+
+void ScenesDockFilter::_search_text_changed(const String &p_newtext) {
+	emit_signal("filter_changed");
+}
+
+String ScenesDockFilter::get_search_term() {
+	return search_box->get_text().strip_edges();
+}
+
+String ScenesDockFilter::get_file_filter() {
+	return _current_filter;
+}
+
+void ScenesDockFilter::_file_filter_selected(int p_idx) {
+	String selected = filters[file_filter->get_selected()];
+	if (_current_filter != selected ) {
+		_current_filter = selected;
+		emit_signal("filter_changed");
+	}
 }
+
+void ScenesDockFilter::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("_command"),&ScenesDockFilter::_command);
+	ObjectTypeDB::bind_method(_MD("_search_text_changed"), &ScenesDockFilter::_search_text_changed);
+	ObjectTypeDB::bind_method(_MD("_file_filter_selected"), &ScenesDockFilter::_file_filter_selected);
+
+	ADD_SIGNAL( MethodInfo("filter_changed") );
+}
+
+ScenesDockFilter::ScenesDockFilter(Tree *p_tree) {
+
+	_current_filter = "*";
+
+	tree = p_tree;
+
+	file_filter = memnew( OptionButton );
+	file_filter->set_custom_minimum_size(Size2(90,10));
+	file_filter->set_clip_text(true);
+	file_filter->connect("item_selected", this, "_file_filter_selected");
+	add_child(file_filter);
+
+	_setup_filters();
+
+	search_box = memnew( LineEdit );
+	search_box->connect("text_changed",this,"_search_text_changed");
+	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
+	add_child(search_box);
+
+	clear_search_button = memnew( Button );
+	clear_search_button->set_text("clear");
+	clear_search_button->connect("pressed",this,"_command",make_binds(CMD_CLEAR_FILTER));
+	add_child(clear_search_button);
+
+}
+
diff --git a/tools/editor/scenes_dock.h b/tools/editor/scenes_dock.h
index eab31a5a4d..cf48e2885f 100644
--- a/tools/editor/scenes_dock.h
+++ b/tools/editor/scenes_dock.h
@@ -34,6 +34,8 @@
 #include "scene/gui/tree.h"
 #include "scene/gui/label.h"
 #include "scene/gui/button.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/box_container.h"
 #include "os/dir_access.h"
 #include "os/thread.h"
 
@@ -42,8 +44,9 @@
 
 class EditorNode;
 
-class ScenesDock : public Control {
-	OBJ_TYPE( ScenesDock, Control );
+class ScenesDockFilter;
+class ScenesDock : public VBoxContainer {
+	OBJ_TYPE( ScenesDock, VBoxContainer );
 
 	EditorNode *editor;
 	Set<String> favorites;
@@ -54,6 +57,8 @@ class ScenesDock : public Control {
 	Button *button_open;
 	Timer *timer;
 
+	ScenesDockFilter *tree_filter;
+
 	bool updating_tree;
 	Tree * tree;
 	bool _create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir);
@@ -77,4 +82,34 @@ public:
 	~ScenesDock();
 };
 
+class ScenesDockFilter : public HBoxContainer {
+
+	OBJ_TYPE( ScenesDockFilter, HBoxContainer );
+
+	enum Command {
+		CMD_CLEAR_FILTER,
+	};
+
+	Tree *tree;
+	OptionButton *file_filter;
+	LineEdit *search_box;
+	Button *clear_search_button;
+
+	String _current_filter;
+	Vector<String> filters;
+
+	void _command(int p_command);
+	void _search_text_changed(const String& p_newtext);
+	void _setup_filters();
+	void _file_filter_selected(int p_idx);
+
+protected:
+	static void _bind_methods();
+
+public:
+	String get_search_term();
+	String get_file_filter();
+	ScenesDockFilter(Tree *p_tree);
+};
+
 #endif // SCENES_DOCK_H