Merge pull request #24402 from guilhermefelipecgs/state_machine_improvement

Improvements to AnimationNodeStateMachine

6 files changed, 1494 insertions, 370 deletions

diff --git a/doc/classes/AnimationNodeStateMachine.xml b/doc/classes/AnimationNodeStateMachine.xml
index 2cafdf8aaa..6140dd799f 100644
--- a/doc/classes/AnimationNodeStateMachine.xml
+++ b/doc/classes/AnimationNodeStateMachine.xml
@@ -39,12 +39,6 @@
 				Adds a transition between the given nodes.
 			</description>
 		</method>
-		<method name="get_end_node" qualifiers="const">
-			<return type="String" />
-			<description>
-				Returns the graph's end node.
-			</description>
-		</method>
 		<method name="get_graph_offset" qualifiers="const">
 			<return type="Vector2" />
 			<description>
@@ -72,12 +66,6 @@
 				Returns the given node's coordinates. Used for display in the editor.
 			</description>
 		</method>
-		<method name="get_start_node" qualifiers="const">
-			<return type="String" />
-			<description>
-				Returns the graph's end node.
-			</description>
-		</method>
 		<method name="get_transition" qualifiers="const">
 			<return type="AnimationNodeStateMachineTransition" />
 			<argument index="0" name="idx" type="int" />
@@ -157,13 +145,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_end_node">
-			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<description>
-				Sets the given node as the graph end point.
-			</description>
-		</method>
 		<method name="set_graph_offset">
 			<return type="void" />
 			<argument index="0" name="offset" type="Vector2" />
@@ -179,12 +160,5 @@
 				Sets the node's coordinates. Used for display in the editor.
 			</description>
 		</method>
-		<method name="set_start_node">
-			<return type="void" />
-			<argument index="0" name="name" type="StringName" />
-			<description>
-				Sets the given node as the graph start point.
-			</description>
-		</method>
 	</methods>
 </class>
diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp
index 40e93780e4..fba59e701e 100644
--- a/editor/plugins/animation_state_machine_editor.cpp
+++ b/editor/plugins/animation_state_machine_editor.cpp
@@ -42,6 +42,8 @@
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
+#include "scene/gui/tree.h"
+#include "scene/main/viewport.h"
 #include "scene/main/window.h"
 
 bool AnimationNodeStateMachineEditor::can_edit(const Ref<AnimationNode> &p_node) {
@@ -55,7 +57,10 @@ void AnimationNodeStateMachineEditor::edit(const Ref<AnimationNode> &p_node) {
 	if (state_machine.is_valid()) {
 		selected_transition_from = StringName();
 		selected_transition_to = StringName();
+		selected_transition_index = -1;
+		selected_multi_transition = TransitionLine();
 		selected_node = StringName();
+		selected_nodes.clear();
 		_update_mode();
 		_update_graph();
 	}
@@ -69,71 +74,39 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 
 	Ref<InputEventKey> k = p_event;
 	if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->get_keycode() == Key::KEY_DELETE && !k->is_echo()) {
-		if (selected_node != StringName() || selected_transition_to != StringName() || selected_transition_from != StringName()) {
+		if (selected_node != StringName() || !selected_nodes.is_empty() || selected_transition_to != StringName() || selected_transition_from != StringName()) {
 			_erase_selected();
 			accept_event();
 		}
 	}
 
-	Ref<InputEventMouseButton> mb = p_event;
-
-	//Add new node
-	if (mb.is_valid() && mb->is_pressed() && ((tool_select->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) || (tool_create->is_pressed() && mb->get_button_index() == MouseButton::LEFT))) {
-		menu->clear();
-		animations_menu->clear();
-		animations_to_add.clear();
-		List<StringName> classes;
-		classes.sort_custom<StringName::AlphCompare>();
-
-		ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
-		menu->add_submenu_item(TTR("Add Animation"), "animations");
-
-		AnimationTree *gp = AnimationTreeEditor::get_singleton()->get_tree();
-		ERR_FAIL_COND(!gp);
-		if (gp && gp->has_node(gp->get_animation_player())) {
-			AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(gp->get_node(gp->get_animation_player()));
-			if (ap) {
-				List<StringName> names;
-				ap->get_animation_list(&names);
-				for (const StringName &E : names) {
-					animations_menu->add_icon_item(get_theme_icon(SNAME("Animation"), SNAME("EditorIcons")), E);
-					animations_to_add.push_back(E);
-				}
-			}
-		}
+	// Group selected nodes on a state machine
+	if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->is_ctrl_pressed() && !k->is_shift_pressed() && k->get_keycode() == Key::G && !k->is_echo()) {
+		_group_selected_nodes();
+	}
 
-		for (const StringName &E : classes) {
-			String name = String(E).replace_first("AnimationNode", "");
-			if (name == "Animation") {
-				continue; // nope
-			}
-			int idx = menu->get_item_count();
-			menu->add_item(vformat(TTR("Add %s"), name), idx);
-			menu->set_item_metadata(idx, E);
-		}
-		Ref<AnimationNode> clipb = EditorSettings::get_singleton()->get_resource_clipboard();
+	// Ungroup state machine
+	if (tool_select->is_pressed() && k.is_valid() && k->is_pressed() && k->is_ctrl_pressed() && k->is_shift_pressed() && k->get_keycode() == Key::G && !k->is_echo()) {
+		_ungroup_selected_nodes();
+	}
 
-		if (clipb.is_valid()) {
-			menu->add_separator();
-			menu->add_item(TTR("Paste"), MENU_PASTE);
-		}
-		menu->add_separator();
-		menu->add_item(TTR("Load..."), MENU_LOAD_FILE);
+	Ref<InputEventMouseButton> mb = p_event;
 
-		menu->set_position(state_machine_draw->get_screen_position() + mb->get_position());
-		menu->reset_size();
-		menu->popup();
-		add_node_pos = mb->get_position() / EDSCALE + state_machine->get_graph_offset();
+	// Add new node
+	if (mb.is_valid() && mb->is_pressed() && !box_selecting && !connecting && ((tool_select->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) || (tool_create->is_pressed() && mb->get_button_index() == MouseButton::LEFT))) {
+		connecting_from = StringName();
+		_open_menu(mb->get_position());
 	}
 
-	// select node or push a field inside
-	if (mb.is_valid() && !mb->is_shift_pressed() && mb->is_pressed() && tool_select->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
+	// Select node or push a field inside
+	if (mb.is_valid() && !mb->is_shift_pressed() && !mb->is_ctrl_pressed() && mb->is_pressed() && tool_select->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		selected_transition_from = StringName();
 		selected_transition_to = StringName();
+		selected_transition_index = -1;
+		selected_multi_transition = TransitionLine();
 		selected_node = StringName();
 
 		for (int i = node_rects.size() - 1; i >= 0; i--) { //inverse to draw order
-
 			if (node_rects[i].play.has_point(mb->get_position())) { //edit name
 				if (play_mode->get_selected() == 1 || !playback->is_playing()) {
 					//start
@@ -146,8 +119,7 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 				return;
 			}
 
-			if (node_rects[i].name.has_point(mb->get_position())) { //edit name
-
+			if (node_rects[i].name.has_point(mb->get_position()) && state_machine->can_edit_node(node_rects[i].node_name)) { // edit name
 				Ref<StyleBox> line_sb = get_theme_stylebox(SNAME("normal"), SNAME("LineEdit"));
 
 				Rect2 edit_rect = node_rects[i].name;
@@ -173,6 +145,12 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 			if (node_rects[i].node.has_point(mb->get_position())) { //select node since nothing else was selected
 				selected_node = node_rects[i].node_name;
 
+				if (!selected_nodes.has(selected_node)) {
+					selected_nodes.clear();
+				}
+
+				selected_nodes.insert(selected_node);
+
 				Ref<AnimationNode> anode = state_machine->get_node(selected_node);
 				EditorNode::get_singleton()->push_item(anode.ptr(), "", true);
 				state_machine_draw->update();
@@ -209,23 +187,53 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 		if (closest >= 0) {
 			selected_transition_from = transition_lines[closest].from_node;
 			selected_transition_to = transition_lines[closest].to_node;
+			selected_transition_index = closest;
 
 			Ref<AnimationNodeStateMachineTransition> tr = state_machine->get_transition(closest);
 			EditorNode::get_singleton()->push_item(tr.ptr(), "", true);
+
+			if (!transition_lines[closest].multi_transitions.is_empty()) {
+				selected_transition_index = -1;
+				selected_multi_transition = transition_lines[closest];
+
+				Ref<EditorAnimationMultiTransitionEdit> multi;
+				multi.instantiate();
+				multi->add_transition(selected_transition_from, selected_transition_to, tr);
+
+				for (int i = 0; i < transition_lines[closest].multi_transitions.size(); i++) {
+					int index = transition_lines[closest].multi_transitions[i].transition_index;
+
+					Ref<AnimationNodeStateMachineTransition> transition = state_machine->get_transition(index);
+					StringName from = transition_lines[closest].multi_transitions[i].from_node;
+					StringName to = transition_lines[closest].multi_transitions[i].to_node;
+
+					multi->add_transition(from, to, transition);
+				}
+				EditorNode::get_singleton()->push_item(multi.ptr(), "", true);
+			}
 		}
 
 		state_machine_draw->update();
 		_update_mode();
 	}
 
-	//end moving node
+	// End moving node
 	if (mb.is_valid() && dragging_selected_attempt && mb->get_button_index() == MouseButton::LEFT && !mb->is_pressed()) {
 		if (dragging_selected) {
 			Ref<AnimationNode> an = state_machine->get_node(selected_node);
 			updating = true;
+
 			undo_redo->create_action(TTR("Move Node"));
-			undo_redo->add_do_method(state_machine.ptr(), "set_node_position", selected_node, state_machine->get_node_position(selected_node) + drag_ofs / EDSCALE);
-			undo_redo->add_undo_method(state_machine.ptr(), "set_node_position", selected_node, state_machine->get_node_position(selected_node));
+
+			for (int i = 0; i < node_rects.size(); i++) {
+				if (!selected_nodes.has(node_rects[i].node_name)) {
+					continue;
+				}
+
+				undo_redo->add_do_method(state_machine.ptr(), "set_node_position", node_rects[i].node_name, state_machine->get_node_position(node_rects[i].node_name) + drag_ofs / EDSCALE);
+				undo_redo->add_undo_method(state_machine.ptr(), "set_node_position", node_rects[i].node_name, state_machine->get_node_position(node_rects[i].node_name));
+			}
+
 			undo_redo->add_do_method(this, "_update_graph");
 			undo_redo->add_undo_method(this, "_update_graph");
 			undo_redo->commit_action();
@@ -239,7 +247,7 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 		state_machine_draw->update();
 	}
 
-	//connect nodes
+	// Connect nodes
 	if (mb.is_valid() && ((tool_select->is_pressed() && mb->is_shift_pressed()) || tool_connect->is_pressed()) && mb->get_button_index() == MouseButton::LEFT && mb->is_pressed()) {
 		for (int i = node_rects.size() - 1; i >= 0; i--) { //inverse to draw order
 			if (node_rects[i].node.has_point(mb->get_position())) { //select node since nothing else was selected
@@ -252,47 +260,63 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 		}
 	}
 
-	//end connecting nodes
+	// End connecting nodes
 	if (mb.is_valid() && connecting && mb->get_button_index() == MouseButton::LEFT && !mb->is_pressed()) {
 		if (connecting_to_node != StringName()) {
-			if (state_machine->has_transition(connecting_from, connecting_to_node)) {
-				EditorNode::get_singleton()->show_warning(TTR("Transition exists!"));
+			Ref<AnimationNode> node = state_machine->get_node(connecting_to_node);
+			Ref<AnimationNodeStateMachine> anodesm = node;
+			Ref<AnimationNodeEndState> end_node = node;
 
+			if (state_machine->has_transition(connecting_from, connecting_to_node) && state_machine->can_edit_node(connecting_to_node) && !anodesm.is_valid()) {
+				EditorNode::get_singleton()->show_warning(TTR("Transition exists!"));
+				connecting = false;
 			} else {
-				Ref<AnimationNodeStateMachineTransition> tr;
-				tr.instantiate();
-				tr->set_switch_mode(AnimationNodeStateMachineTransition::SwitchMode(transition_mode->get_selected()));
-
-				updating = true;
-				undo_redo->create_action(TTR("Add Transition"));
-				undo_redo->add_do_method(state_machine.ptr(), "add_transition", connecting_from, connecting_to_node, tr);
-				undo_redo->add_undo_method(state_machine.ptr(), "remove_transition", connecting_from, connecting_to_node);
-				undo_redo->add_do_method(this, "_update_graph");
-				undo_redo->add_undo_method(this, "_update_graph");
-				undo_redo->commit_action();
-				updating = false;
-
-				selected_transition_from = connecting_from;
-				selected_transition_to = connecting_to_node;
-
-				EditorNode::get_singleton()->push_item(tr.ptr(), "", true);
-				_update_mode();
+				if (anodesm.is_valid() || end_node.is_valid()) {
+					_open_connect_menu(mb->get_position());
+				} else {
+					_add_transition();
+				}
 			}
+		} else {
+			_open_menu(mb->get_position());
 		}
 		connecting_to_node = StringName();
-		connecting = false;
 		state_machine_draw->update();
 	}
 
+	// Start box selecting
+	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT && tool_select->is_pressed()) {
+		box_selecting = true;
+		box_selecting_from = box_selecting_to = state_machine_draw->get_local_mouse_position();
+		box_selecting_rect = Rect2(MIN(box_selecting_from.x, box_selecting_to.x),
+				MIN(box_selecting_from.y, box_selecting_to.y),
+				ABS(box_selecting_from.x - box_selecting_to.x),
+				ABS(box_selecting_from.y - box_selecting_to.y));
+
+		if (mb->is_ctrl_pressed() || mb->is_shift_pressed()) {
+			previous_selected = selected_nodes;
+		} else {
+			selected_nodes.clear();
+			previous_selected.clear();
+		}
+	}
+
+	// End box selecting
+	if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && !mb->is_pressed() && box_selecting) {
+		box_selecting = false;
+		state_machine_draw->update();
+		_update_mode();
+	}
+
 	Ref<InputEventMouseMotion> mm = p_event;
 
-	//pan window
+	// Pan window
 	if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_MIDDLE) != MouseButton::NONE) {
 		h_scroll->set_value(h_scroll->get_value() - mm->get_relative().x);
 		v_scroll->set_value(v_scroll->get_value() - mm->get_relative().y);
 	}
 
-	//move mouse while connecting
+	// Move mouse while connecting
 	if (mm.is_valid() && connecting) {
 		connecting_to = mm->get_position();
 		connecting_to_node = StringName();
@@ -306,7 +330,7 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 		}
 	}
 
-	//move mouse while moving a node
+	// Move mouse while moving a node
 	if (mm.is_valid() && dragging_selected_attempt) {
 		dragging_selected = true;
 		drag_ofs = mm->get_position() - drag_from;
@@ -353,6 +377,11 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 		int new_over_node_what = -1;
 		if (tool_select->is_pressed()) {
 			for (int i = node_rects.size() - 1; i >= 0; i--) { // Inverse to draw order.
+
+				if (!state_machine->can_edit_node(node_rects[i].node_name)) {
+					continue; // start/end node can't be edited
+				}
+
 				if (node_rects[i].node.has_point(mm->get_position())) {
 					new_over_node = node_rects[i].node_name;
 					if (node_rects[i].play.has_point(mm->get_position())) {
@@ -370,6 +399,43 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 			over_node_what = new_over_node_what;
 			state_machine_draw->update();
 		}
+
+		// set tooltip for transition
+		if (tool_select->is_pressed()) {
+			int closest = -1;
+			float closest_d = 1e20;
+			for (int i = 0; i < transition_lines.size(); i++) {
+				Vector2 s[2] = {
+					transition_lines[i].from,
+					transition_lines[i].to
+				};
+				Vector2 cpoint = Geometry2D::get_closest_point_to_segment(mm->get_position(), s);
+				float d = cpoint.distance_to(mm->get_position());
+				if (d > transition_lines[i].width) {
+					continue;
+				}
+
+				if (d < closest_d) {
+					closest = i;
+					closest_d = d;
+				}
+			}
+
+			if (closest >= 0) {
+				String from = String(transition_lines[closest].from_node);
+				String to = String(transition_lines[closest].to_node);
+				String tooltip = from + " -> " + to;
+
+				for (int i = 0; i < transition_lines[closest].multi_transitions.size(); i++) {
+					from = String(transition_lines[closest].multi_transitions[i].from_node);
+					to = String(transition_lines[closest].multi_transitions[i].to_node);
+					tooltip += "\n" + from + " -> " + to;
+				}
+				state_machine_draw->set_tooltip(tooltip);
+			} else {
+				state_machine_draw->set_tooltip("");
+			}
+		}
 	}
 
 	Ref<InputEventPanGesture> pan_gesture = p_event;
@@ -396,6 +462,458 @@ Control::CursorShape AnimationNodeStateMachineEditor::get_cursor_shape(const Poi
 	return cursor_shape;
 }
 
+void AnimationNodeStateMachineEditor::_group_selected_nodes() {
+	if (!selected_nodes.is_empty()) {
+		if (selected_nodes.size() == 1 && (selected_nodes.front()->get() == state_machine->start_node || selected_nodes.front()->get() == state_machine->end_node))
+			return;
+
+		Ref<AnimationNodeStateMachine> group_sm = memnew(AnimationNodeStateMachine);
+		Vector2 group_position;
+
+		Vector<NodeUR> nodes_ur;
+		Vector<TransitionUR> transitions_ur;
+
+		int base = 1;
+		String base_name = group_sm->get_caption();
+		String group_name = base_name;
+
+		while (state_machine->has_node(group_name) && !selected_nodes.has(group_name)) {
+			base++;
+			group_name = base_name + " " + itos(base);
+		}
+
+		updating = true;
+		undo_redo->create_action("Group");
+
+		// Move selected nodes to the new state machine
+		for (const StringName &E : selected_nodes) {
+			if (!state_machine->can_edit_node(E)) {
+				continue;
+			}
+
+			Ref<AnimationNode> node = state_machine->get_node(E);
+			Vector2 node_position = state_machine->get_node_position(E);
+			group_position += node_position;
+
+			NodeUR new_node;
+			new_node.name = E;
+			new_node.node = node;
+			new_node.position = node_position;
+
+			nodes_ur.push_back(new_node);
+		}
+
+		// Add the transitions to the new state machine
+		for (int i = 0; i < state_machine->get_transition_count(); i++) {
+			String from = state_machine->get_transition_from(i);
+			String to = state_machine->get_transition_to(i);
+
+			String local_from = from.get_slicec('/', 0);
+			String local_to = to.get_slicec('/', 0);
+
+			String old_from = from;
+			String old_to = to;
+
+			bool from_selected = false;
+			bool to_selected = false;
+
+			if (selected_nodes.has(local_from) && local_from != state_machine->start_node) {
+				from_selected = true;
+			}
+			if (selected_nodes.has(local_to) && local_to != state_machine->end_node) {
+				to_selected = true;
+			}
+			if (!from_selected && !to_selected) {
+				continue;
+			}
+
+			Ref<AnimationNodeStateMachineTransition> tr = state_machine->get_transition(i);
+
+			if (!from_selected) {
+				from = "../" + old_from;
+			}
+			if (!to_selected) {
+				to = "../" + old_to;
+			}
+
+			TransitionUR new_tr;
+			new_tr.new_from = from;
+			new_tr.new_to = to;
+			new_tr.old_from = old_from;
+			new_tr.old_to = old_to;
+			new_tr.transition = tr;
+
+			transitions_ur.push_back(new_tr);
+		}
+
+		for (int i = 0; i < nodes_ur.size(); i++) {
+			undo_redo->add_do_method(state_machine.ptr(), "remove_node", nodes_ur[i].name);
+			undo_redo->add_undo_method(group_sm.ptr(), "remove_node", nodes_ur[i].name);
+		}
+
+		undo_redo->add_do_method(state_machine.ptr(), "add_node", group_name, group_sm, group_position / nodes_ur.size());
+		undo_redo->add_undo_method(state_machine.ptr(), "remove_node", group_name);
+
+		for (int i = 0; i < nodes_ur.size(); i++) {
+			undo_redo->add_do_method(group_sm.ptr(), "add_node", nodes_ur[i].name, nodes_ur[i].node, nodes_ur[i].position);
+			undo_redo->add_undo_method(state_machine.ptr(), "add_node", nodes_ur[i].name, nodes_ur[i].node, nodes_ur[i].position);
+		}
+
+		for (int i = 0; i < transitions_ur.size(); i++) {
+			undo_redo->add_do_method(group_sm.ptr(), "add_transition", transitions_ur[i].new_from, transitions_ur[i].new_to, transitions_ur[i].transition);
+			undo_redo->add_undo_method(state_machine.ptr(), "add_transition", transitions_ur[i].old_from, transitions_ur[i].old_to, transitions_ur[i].transition);
+		}
+
+		undo_redo->add_do_method(this, "_update_graph");
+		undo_redo->add_undo_method(this, "_update_graph");
+		undo_redo->commit_action();
+		updating = false;
+
+		selected_nodes.clear();
+		selected_nodes.insert(group_name);
+		state_machine_draw->update();
+		accept_event();
+		_update_mode();
+	}
+}
+
+void AnimationNodeStateMachineEditor::_ungroup_selected_nodes() {
+	bool find = false;
+	Set<StringName> new_selected_nodes;
+
+	for (const StringName &E : selected_nodes) {
+		Ref<AnimationNodeStateMachine> group_sm = state_machine->get_node(E);
+
+		if (group_sm.is_valid()) {
+			find = true;
+
+			Vector2 group_position = state_machine->get_node_position(E);
+			StringName group_name = E;
+
+			List<AnimationNode::ChildNode> nodes;
+			group_sm->get_child_nodes(&nodes);
+
+			Vector<NodeUR> nodes_ur;
+			Vector<TransitionUR> transitions_ur;
+
+			updating = true;
+			undo_redo->create_action("Ungroup");
+
+			// Move all child nodes to current state machine
+			for (int i = 0; i < nodes.size(); i++) {
+				if (!group_sm->can_edit_node(nodes[i].name)) {
+					continue;
+				}
+
+				Vector2 node_position = group_sm->get_node_position(nodes[i].name);
+
+				NodeUR new_node;
+				new_node.name = nodes[i].name;
+				new_node.position = node_position;
+				new_node.node = nodes[i].node;
+
+				nodes_ur.push_back(new_node);
+			}
+
+			for (int i = 0; i < group_sm->get_transition_count(); i++) {
+				String from = group_sm->get_transition_from(i);
+				String to = group_sm->get_transition_to(i);
+				Ref<AnimationNodeStateMachineTransition> tr = group_sm->get_transition(i);
+
+				TransitionUR new_tr;
+				new_tr.new_from = from.replace_first("../", "");
+				new_tr.new_to = to.replace_first("../", "");
+				new_tr.old_from = from;
+				new_tr.old_to = to;
+				new_tr.transition = tr;
+
+				transitions_ur.push_back(new_tr);
+			}
+
+			for (int i = 0; i < nodes_ur.size(); i++) {
+				undo_redo->add_do_method(group_sm.ptr(), "remove_node", nodes_ur[i].name);
+				undo_redo->add_undo_method(state_machine.ptr(), "remove_node", nodes_ur[i].name);
+			}
+
+			undo_redo->add_do_method(state_machine.ptr(), "remove_node", group_name);
+			undo_redo->add_undo_method(state_machine.ptr(), "add_node", group_name, group_sm, group_position);
+
+			for (int i = 0; i < nodes_ur.size(); i++) {
+				new_selected_nodes.insert(nodes_ur[i].name);
+				undo_redo->add_do_method(state_machine.ptr(), "add_node", nodes_ur[i].name, nodes_ur[i].node, nodes_ur[i].position);
+				undo_redo->add_undo_method(group_sm.ptr(), "add_node", nodes_ur[i].name, nodes_ur[i].node, nodes_ur[i].position);
+			}
+
+			for (int i = 0; i < transitions_ur.size(); i++) {
+				if (transitions_ur[i].old_from != state_machine->start_node && transitions_ur[i].old_to != state_machine->end_node) {
+					undo_redo->add_do_method(state_machine.ptr(), "add_transition", transitions_ur[i].new_from, transitions_ur[i].new_to, transitions_ur[i].transition);
+				}
+
+				undo_redo->add_undo_method(group_sm.ptr(), "add_transition", transitions_ur[i].old_from, transitions_ur[i].old_to, transitions_ur[i].transition);
+			}
+
+			for (int i = 0; i < state_machine->get_transition_count(); i++) {
+				String from = state_machine->get_transition_from(i);
+				String to = state_machine->get_transition_to(i);
+				Ref<AnimationNodeStateMachineTransition> tr = state_machine->get_transition(i);
+
+				if (from == group_name || to == group_name) {
+					undo_redo->add_undo_method(state_machine.ptr(), "add_transition", from, to, tr);
+				}
+			}
+
+			undo_redo->add_do_method(this, "_update_graph");
+			undo_redo->add_undo_method(this, "_update_graph");
+			undo_redo->commit_action();
+			updating = false;
+		}
+	}
+
+	if (find) {
+		selected_nodes = new_selected_nodes;
+		selected_node = StringName();
+		state_machine_draw->update();
+		accept_event();
+		_update_mode();
+	}
+}
+
+void AnimationNodeStateMachineEditor::_open_menu(const Vector2 &p_position) {
+	menu->clear();
+	animations_menu->clear();
+	animations_to_add.clear();
+	List<StringName> classes;
+	classes.sort_custom<StringName::AlphCompare>();
+
+	ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+	menu->add_submenu_item(TTR("Add Animation"), "animations");
+
+	AnimationTree *gp = AnimationTreeEditor::get_singleton()->get_tree();
+	ERR_FAIL_COND(!gp);
+	if (gp && gp->has_node(gp->get_animation_player())) {
+		AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(gp->get_node(gp->get_animation_player()));
+		if (ap) {
+			List<StringName> names;
+			ap->get_animation_list(&names);
+			for (List<StringName>::Element *E = names.front(); E; E = E->next()) {
+				animations_menu->add_icon_item(get_theme_icon("Animation", "EditorIcons"), E->get());
+				animations_to_add.push_back(E->get());
+			}
+		}
+	}
+
+	for (List<StringName>::Element *E = classes.front(); E; E = E->next()) {
+		String name = String(E->get()).replace_first("AnimationNode", "");
+		if (name == "Animation" || name == "StartState" || name == "EndState") {
+			continue; // nope
+		}
+		int idx = menu->get_item_count();
+		menu->add_item(vformat(TTR("Add %s"), name), idx);
+		menu->set_item_metadata(idx, E->get());
+	}
+	Ref<AnimationNode> clipb = EditorSettings::get_singleton()->get_resource_clipboard();
+
+	if (clipb.is_valid()) {
+		menu->add_separator();
+		menu->add_item(TTR("Paste"), MENU_PASTE);
+	}
+	menu->add_separator();
+	menu->add_item(TTR("Load..."), MENU_LOAD_FILE);
+
+	menu->set_position(state_machine_draw->get_screen_transform().xform(p_position));
+	menu->popup();
+	add_node_pos = p_position / EDSCALE + state_machine->get_graph_offset();
+}
+
+void AnimationNodeStateMachineEditor::_open_connect_menu(const Vector2 &p_position) {
+	ERR_FAIL_COND(connecting_to_node == StringName());
+
+	Ref<AnimationNode> node = state_machine->get_node(connecting_to_node);
+	Ref<AnimationNodeStateMachine> anodesm = node;
+	Ref<AnimationNodeEndState> end_node = node;
+	ERR_FAIL_COND(!anodesm.is_valid() && !end_node.is_valid());
+
+	connect_menu->clear();
+	state_machine_menu->clear();
+	end_menu->clear();
+	nodes_to_connect.clear();
+
+	for (int i = connect_menu->get_child_count() - 1; i >= 0; i--) {
+		Node *child = connect_menu->get_child(i);
+
+		if (child->is_class("PopupMenu")) {
+			connect_menu->remove_child(child);
+		}
+	}
+
+	connect_menu->reset_size();
+	state_machine_menu->reset_size();
+	end_menu->reset_size();
+
+	if (anodesm.is_valid()) {
+		_create_submenu(connect_menu, anodesm, connecting_to_node, connecting_to_node);
+	} else {
+		Ref<AnimationNodeStateMachine> prev = state_machine;
+		_create_submenu(connect_menu, prev, connecting_to_node, connecting_to_node, true);
+	}
+
+	connect_menu->add_submenu_item(TTR("To") + " Animation", connecting_to_node);
+
+	if (state_machine_menu->get_item_count() > 0 || !end_node.is_valid()) {
+		connect_menu->add_submenu_item(TTR("To") + " StateMachine", "state_machines");
+		connect_menu->add_child(state_machine_menu);
+	}
+
+	if (end_node.is_valid()) {
+		connect_menu->add_submenu_item(TTR("To") + " End", "end_nodes");
+		connect_menu->add_child(end_menu);
+	} else {
+		state_machine_menu->add_item(connecting_to_node, nodes_to_connect.size());
+	}
+
+	nodes_to_connect.push_back(connecting_to_node);
+
+	if (nodes_to_connect.size() == 1) {
+		_add_transition();
+		return;
+	}
+
+	connect_menu->set_position(state_machine_draw->get_screen_transform().xform(p_position));
+	connect_menu->popup();
+}
+
+bool AnimationNodeStateMachineEditor::_create_submenu(PopupMenu *p_menu, Ref<AnimationNodeStateMachine> p_nodesm, const StringName &p_name, const StringName &p_path, bool from_root, Vector<Ref<AnimationNodeStateMachine>> p_parents) {
+	String prev_path;
+	Vector<Ref<AnimationNodeStateMachine>> parents = p_parents;
+
+	if (from_root) {
+		Ref<AnimationNodeStateMachine> prev = p_nodesm->get_prev_state_machine();
+
+		while (prev.is_valid()) {
+			parents.push_back(prev);
+			p_nodesm = prev;
+			prev_path += "../";
+			prev = prev->get_prev_state_machine();
+		}
+		prev_path.remove_at(prev_path.size() - 1);
+	}
+
+	List<StringName> nodes;
+	p_nodesm->get_node_list(&nodes);
+
+	PopupMenu *nodes_menu = memnew(PopupMenu);
+	nodes_menu->set_name(p_name);
+	nodes_menu->connect("id_pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_connect_to));
+	p_menu->add_child(nodes_menu);
+
+	bool node_added = false;
+	for (const StringName &E : nodes) {
+		if (p_nodesm->can_edit_node(E)) {
+			Ref<AnimationNodeStateMachine> ansm = p_nodesm->get_node(E);
+
+			String path;
+			if (from_root) {
+				path = prev_path + "/" + E;
+			} else {
+				path = String(p_path) + "/" + E;
+			}
+
+			if (ansm == state_machine) {
+				end_menu->add_item(E, nodes_to_connect.size());
+				nodes_to_connect.push_back(state_machine->end_node);
+				continue;
+			}
+
+			if (ansm.is_valid()) {
+				bool found = false;
+
+				for (int i = 0; i < parents.size(); i++) {
+					if (parents[i] == ansm) {
+						path = path.replace_first("/../" + E, "");
+						found = true;
+						break;
+					}
+				}
+
+				if (!found) {
+					state_machine_menu->add_item(E, nodes_to_connect.size());
+					nodes_to_connect.push_back(path);
+				} else {
+					end_menu->add_item(E, nodes_to_connect.size());
+					nodes_to_connect.push_back(path + "/" + state_machine->end_node);
+				}
+
+				if (_create_submenu(nodes_menu, ansm, E, path, false, parents)) {
+					nodes_menu->add_submenu_item(E, E);
+					node_added = true;
+				}
+			} else {
+				nodes_menu->add_item(E, nodes_to_connect.size());
+				nodes_to_connect.push_back(path);
+				node_added = true;
+			}
+		}
+	}
+
+	return node_added;
+}
+
+void AnimationNodeStateMachineEditor::_stop_connecting() {
+	connecting = false;
+	state_machine_draw->update();
+}
+
+void AnimationNodeStateMachineEditor::_delete_selected() {
+	TreeItem *item = delete_tree->get_next_selected(nullptr);
+	while (item) {
+		if (!updating) {
+			updating = true;
+			selected_multi_transition = TransitionLine();
+			undo_redo->create_action("Transition(s) Removed");
+		}
+
+		Vector<String> path = item->get_text(0).split(" -> ");
+
+		selected_transition_from = path[0];
+		selected_transition_to = path[1];
+		_erase_selected(true);
+
+		item = delete_tree->get_next_selected(item);
+	}
+
+	if (updating) {
+		undo_redo->commit_action();
+		updating = false;
+	}
+}
+
+void AnimationNodeStateMachineEditor::_delete_all() {
+	Vector<TransitionLine> multi_transitions = selected_multi_transition.multi_transitions;
+	selected_multi_transition = TransitionLine();
+
+	updating = true;
+	undo_redo->create_action("Transition(s) Removed");
+	_erase_selected(true);
+	for (int i = 0; i < multi_transitions.size(); i++) {
+		selected_transition_from = multi_transitions[i].from_node;
+		selected_transition_to = multi_transitions[i].to_node;
+		_erase_selected(true);
+	}
+	undo_redo->commit_action();
+	updating = false;
+
+	delete_window->hide();
+}
+
+void AnimationNodeStateMachineEditor::_delete_tree_draw() {
+	TreeItem *item = delete_tree->get_next_selected(nullptr);
+	while (item) {
+		delete_window->get_cancel_button()->set_disabled(false);
+		return;
+	}
+	delete_window->get_cancel_button()->set_disabled(true);
+}
+
 void AnimationNodeStateMachineEditor::_file_opened(const String &p_file) {
 	file_loaded = ResourceLoader::load(p_file);
 	if (file_loaded.is_valid()) {
@@ -456,6 +974,8 @@ void AnimationNodeStateMachineEditor::_add_menu_type(int p_index) {
 	undo_redo->add_undo_method(state_machine.ptr(), "remove_node", name);
 	undo_redo->add_do_method(this, "_update_graph");
 	undo_redo->add_undo_method(this, "_update_graph");
+	connecting_to_node = name;
+	_add_transition(true);
 	undo_redo->commit_action();
 	updating = false;
 
@@ -482,13 +1002,58 @@ void AnimationNodeStateMachineEditor::_add_animation_type(int p_index) {
 	undo_redo->add_undo_method(state_machine.ptr(), "remove_node", name);
 	undo_redo->add_do_method(this, "_update_graph");
 	undo_redo->add_undo_method(this, "_update_graph");
+	connecting_to_node = name;
+	_add_transition(true);
 	undo_redo->commit_action();
 	updating = false;
 
 	state_machine_draw->update();
 }
 
-void AnimationNodeStateMachineEditor::_connection_draw(const Vector2 &p_from, const Vector2 &p_to, AnimationNodeStateMachineTransition::SwitchMode p_mode, bool p_enabled, bool p_selected, bool p_travel, bool p_auto_advance) {
+void AnimationNodeStateMachineEditor::_connect_to(int p_index) {
+	connecting_to_node = nodes_to_connect[p_index];
+	_add_transition();
+}
+
+void AnimationNodeStateMachineEditor::_add_transition(const bool p_nested_action) {
+	if (connecting_from != StringName() && connecting_to_node != StringName()) {
+		if (state_machine->has_transition(connecting_from, connecting_to_node)) {
+			EditorNode::get_singleton()->show_warning("Transition exists!");
+			connecting = false;
+			return;
+		}
+
+		Ref<AnimationNodeStateMachineTransition> tr;
+		tr.instantiate();
+		tr->set_switch_mode(AnimationNodeStateMachineTransition::SwitchMode(transition_mode->get_selected()));
+
+		if (!p_nested_action) {
+			updating = true;
+		}
+
+		undo_redo->create_action(TTR("Add Transition"));
+		undo_redo->add_do_method(state_machine.ptr(), "add_transition", connecting_from, connecting_to_node, tr);
+		undo_redo->add_undo_method(state_machine.ptr(), "remove_transition", connecting_from, connecting_to_node);
+		undo_redo->add_do_method(this, "_update_graph");
+		undo_redo->add_undo_method(this, "_update_graph");
+		undo_redo->commit_action();
+
+		if (!p_nested_action) {
+			updating = false;
+		}
+
+		selected_transition_from = connecting_from;
+		selected_transition_to = connecting_to_node;
+		selected_transition_index = transition_lines.size();
+
+		EditorNode::get_singleton()->push_item(tr.ptr(), "", true);
+		_update_mode();
+	}
+
+	connecting = false;
+}
+
+void AnimationNodeStateMachineEditor::_connection_draw(const Vector2 &p_from, const Vector2 &p_to, AnimationNodeStateMachineTransition::SwitchMode p_mode, bool p_enabled, bool p_selected, bool p_travel, bool p_auto_advance, bool p_multi_transitions) {
 	Color linecolor = get_theme_color(SNAME("font_color"), SNAME("Label"));
 	Color icon_color(1, 1, 1);
 	Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor"));
@@ -516,6 +1081,7 @@ void AnimationNodeStateMachineEditor::_connection_draw(const Vector2 &p_from, co
 		linecolor = accent;
 		linecolor.set_hsv(1.0, linecolor.get_s(), linecolor.get_v());
 	}
+
 	state_machine_draw->draw_line(p_from, p_to, linecolor, 2);
 
 	Ref<Texture2D> icon = icons[p_mode + (p_auto_advance ? 3 : 0)];
@@ -526,7 +1092,13 @@ void AnimationNodeStateMachineEditor::_connection_draw(const Vector2 &p_from, co
 	xf.elements[2] = (p_from + p_to) * 0.5 - xf.elements[1] * icon->get_height() * 0.5 - xf.elements[0] * icon->get_height() * 0.5;
 
 	state_machine_draw->draw_set_transform_matrix(xf);
-	state_machine_draw->draw_texture(icon, Vector2(), icon_color);
+	if (p_multi_transitions) {
+		state_machine_draw->draw_texture(icons[0], Vector2(-icon->get_width(), 0), icon_color);
+		state_machine_draw->draw_texture(icons[0], Vector2(), icon_color);
+		state_machine_draw->draw_texture(icons[0], Vector2(icon->get_width(), 0), icon_color);
+	} else {
+		state_machine_draw->draw_texture(icon, Vector2(), icon_color);
+	}
 	state_machine_draw->draw_set_transform_matrix(Transform2D());
 }
 
@@ -557,20 +1129,27 @@ void AnimationNodeStateMachineEditor::_clip_dst_line_to_rect(const Vector2 &p_fr
 void AnimationNodeStateMachineEditor::_state_machine_draw() {
 	Ref<AnimationNodeStateMachinePlayback> playback = AnimationTreeEditor::get_singleton()->get_tree()->get(AnimationTreeEditor::get_singleton()->get_base_path() + "playback");
 
-	Ref<StyleBox> style = get_theme_stylebox(SNAME("state_machine_frame"), SNAME("GraphNode"));
-	Ref<StyleBox> style_selected = get_theme_stylebox(SNAME("state_machine_selected_frame"), SNAME("GraphNode"));
+	Ref<StyleBoxFlat> style = get_theme_stylebox(SNAME("state_machine_frame"), SNAME("GraphNode"));
+	Ref<StyleBoxFlat> style_selected = get_theme_stylebox(SNAME("state_machine_selected_frame"), SNAME("GraphNode"));
 
 	Ref<Font> font = get_theme_font(SNAME("title_font"), SNAME("GraphNode"));
 	int font_size = get_theme_font_size(SNAME("title_font_size"), SNAME("GraphNode"));
 	Color font_color = get_theme_color(SNAME("title_color"), SNAME("GraphNode"));
 	Ref<Texture2D> play = get_theme_icon(SNAME("Play"), SNAME("EditorIcons"));
-	Ref<Texture2D> auto_play = get_theme_icon(SNAME("AutoPlay"), SNAME("EditorIcons"));
 	Ref<Texture2D> edit = get_theme_icon(SNAME("Edit"), SNAME("EditorIcons"));
 	Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor"));
 	Color linecolor = get_theme_color(SNAME("font_color"), SNAME("Label"));
 	linecolor.a *= 0.3;
 	Ref<StyleBox> playing_overlay = get_theme_stylebox(SNAME("position"), SNAME("GraphNode"));
 
+	Ref<StyleBoxFlat> start_overlay = style->duplicate();
+	start_overlay->set_border_width_all(1 * EDSCALE);
+	start_overlay->set_border_color(Color::html("#80f6cf"));
+
+	Ref<StyleBoxFlat> end_overlay = style->duplicate();
+	end_overlay->set_border_width_all(1 * EDSCALE);
+	end_overlay->set_border_color(Color::html("#f26661"));
+
 	bool playing = false;
 	StringName current;
 	StringName blend_from;
@@ -612,22 +1191,25 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 		Ref<AnimationNode> anode = state_machine->get_node(E);
 		String name = E;
 		bool needs_editor = EditorNode::get_singleton()->item_has_editor(anode.ptr());
-		Ref<StyleBox> sb = E == selected_node ? style_selected : style;
+		Ref<StyleBox> sb = selected_nodes.has(E) ? style_selected : style;
 
 		Size2 s = sb->get_minimum_size();
 		int strsize = font->get_string_size(name, font_size).width;
 		s.width += strsize;
 		s.height += MAX(font->get_height(font_size), play->get_height());
 		s.width += sep + play->get_width();
+
 		if (needs_editor) {
 			s.width += sep + edit->get_width();
 		}
 
 		Vector2 offset;
 		offset += state_machine->get_node_position(E) * EDSCALE;
-		if (selected_node == E && dragging_selected) {
+
+		if (selected_nodes.has(E) && dragging_selected) {
 			offset += drag_ofs;
 		}
+
 		offset -= s / 2;
 		offset = offset.floor();
 
@@ -666,7 +1248,7 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 			}
 		}
 
-		_connection_draw(from, to, AnimationNodeStateMachineTransition::SwitchMode(transition_mode->get_selected()), true, false, false, false);
+		_connection_draw(from, to, AnimationNodeStateMachineTransition::SwitchMode(transition_mode->get_selected()), true, false, false, false, false);
 	}
 
 	Ref<Texture2D> tr_reference_icon = get_theme_icon(SNAME("TransitionImmediateBig"), SNAME("EditorIcons"));
@@ -675,13 +1257,18 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 	//draw transition lines
 	for (int i = 0; i < state_machine->get_transition_count(); i++) {
 		TransitionLine tl;
+		tl.transition_index = i;
 		tl.from_node = state_machine->get_transition_from(i);
-		Vector2 ofs_from = (dragging_selected && tl.from_node == selected_node) ? drag_ofs : Vector2();
-		tl.from = (state_machine->get_node_position(tl.from_node) * EDSCALE) + ofs_from - state_machine->get_graph_offset() * EDSCALE;
+		StringName local_from = String(tl.from_node).get_slicec('/', 0);
+		local_from = local_from == ".." ? state_machine->start_node : local_from;
+		Vector2 ofs_from = (dragging_selected && selected_nodes.has(local_from)) ? drag_ofs : Vector2();
+		tl.from = (state_machine->get_node_position(local_from) * EDSCALE) + ofs_from - state_machine->get_graph_offset() * EDSCALE;
 
 		tl.to_node = state_machine->get_transition_to(i);
-		Vector2 ofs_to = (dragging_selected && tl.to_node == selected_node) ? drag_ofs : Vector2();
-		tl.to = (state_machine->get_node_position(tl.to_node) * EDSCALE) + ofs_to - state_machine->get_graph_offset() * EDSCALE;
+		StringName local_to = String(tl.to_node).get_slicec('/', 0);
+		local_to = local_to == ".." ? state_machine->end_node : local_to;
+		Vector2 ofs_to = (dragging_selected && selected_nodes.has(local_to)) ? drag_ofs : Vector2();
+		tl.to = (state_machine->get_node_position(local_to) * EDSCALE) + ofs_to - state_machine->get_graph_offset() * EDSCALE;
 
 		Ref<AnimationNodeStateMachineTransition> tr = state_machine->get_transition(i);
 		tl.disabled = tr->is_disabled();
@@ -690,62 +1277,79 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 		tl.advance_condition_state = false;
 		tl.mode = tr->get_switch_mode();
 		tl.width = tr_bidi_offset;
+		tl.travel = false;
+		tl.hidden = false;
 
-		if (state_machine->has_transition(tl.to_node, tl.from_node)) { //offset if same exists
+		if (state_machine->has_local_transition(local_to, local_from)) { //offset if same exists
 			Vector2 offset = -(tl.from - tl.to).normalized().orthogonal() * tr_bidi_offset;
 			tl.from += offset;
 			tl.to += offset;
 		}
 
 		for (int j = 0; j < node_rects.size(); j++) {
-			if (node_rects[j].node_name == tl.from_node) {
+			if (node_rects[j].node_name == local_from) {
 				_clip_src_line_to_rect(tl.from, tl.to, node_rects[j].node);
 			}
-			if (node_rects[j].node_name == tl.to_node) {
+			if (node_rects[j].node_name == local_to) {
 				_clip_dst_line_to_rect(tl.from, tl.to, node_rects[j].node);
 			}
 		}
 
-		bool selected = selected_transition_from == tl.from_node && selected_transition_to == tl.to_node;
-
-		bool travel = false;
+		tl.selected = selected_transition_from == tl.from_node && selected_transition_to == tl.to_node;
 
-		if (blend_from == tl.from_node && current == tl.to_node) {
-			travel = true;
+		if (blend_from == local_from && current == local_to) {
+			tl.travel = true;
 		}
 
 		if (travel_path.size()) {
-			if (current == tl.from_node && travel_path[0] == tl.to_node) {
-				travel = true;
+			if (current == local_from && travel_path[0] == local_to) {
+				tl.travel = true;
 			} else {
 				for (int j = 0; j < travel_path.size() - 1; j++) {
-					if (travel_path[j] == tl.from_node && travel_path[j + 1] == tl.to_node) {
-						travel = true;
+					if (travel_path[j] == local_from && travel_path[j + 1] == local_to) {
+						tl.travel = true;
 						break;
 					}
 				}
 			}
 		}
 
-		bool auto_advance = tl.auto_advance;
 		StringName fullpath = AnimationTreeEditor::get_singleton()->get_base_path() + String(tl.advance_condition_name);
 		if (tl.advance_condition_name != StringName() && bool(AnimationTreeEditor::get_singleton()->get_tree()->get(fullpath))) {
 			tl.advance_condition_state = true;
-			auto_advance = true;
+			tl.auto_advance = true;
 		}
-		_connection_draw(tl.from, tl.to, tl.mode, !tl.disabled, selected, travel, auto_advance);
 
+		// check if already have this local transition
+		for (int j = 0; j < transition_lines.size(); j++) {
+			StringName from = String(transition_lines[j].from_node).get_slicec('/', 0);
+			StringName to = String(transition_lines[j].to_node).get_slicec('/', 0);
+			from = from == ".." ? state_machine->start_node : from;
+			to = to == ".." ? state_machine->end_node : to;
+
+			if (from == local_from && to == local_to) {
+				tl.hidden = true;
+				transition_lines.write[j].disabled = transition_lines[j].disabled && tl.disabled;
+				transition_lines.write[j].multi_transitions.push_back(tl);
+			}
+		}
 		transition_lines.push_back(tl);
 	}
 
+	for (int i = 0; i < transition_lines.size(); i++) {
+		TransitionLine tl = transition_lines[i];
+		if (!tl.hidden) {
+			_connection_draw(tl.from, tl.to, tl.mode, !tl.disabled, tl.selected, tl.travel, tl.auto_advance, !tl.multi_transitions.is_empty());
+		}
+	}
+
 	//draw actual nodes
 	for (int i = 0; i < node_rects.size(); i++) {
 		String name = node_rects[i].node_name;
 		Ref<AnimationNode> anode = state_machine->get_node(name);
 		bool needs_editor = AnimationTreeEditor::get_singleton()->can_edit(anode);
-		Ref<StyleBox> sb = name == selected_node ? style_selected : style;
+		Ref<StyleBox> sb = selected_nodes.has(name) ? style_selected : style;
 		int strsize = font->get_string_size(name, font_size).width;
-
 		NodeRect &nr = node_rects.write[i];
 
 		Vector2 offset = nr.node.position;
@@ -756,18 +1360,16 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 		//now scroll it to draw
 		state_machine_draw->draw_style_box(sb, nr.node);
 
-		if (playing && (blend_from == name || current == name || travel_path.has(name))) {
-			state_machine_draw->draw_style_box(playing_overlay, nr.node);
+		if (state_machine->start_node == name) {
+			state_machine_draw->draw_style_box(sb == style_selected ? style_selected : start_overlay, nr.node);
 		}
 
-		bool onstart = state_machine->get_start_node() == name;
-		if (onstart) {
-			state_machine_draw->draw_string(font, offset + Vector2(0, -font->get_height(font_size) - 3 * EDSCALE + font->get_ascent(font_size)), TTR("Start"), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
+		if (state_machine->end_node == name) {
+			state_machine_draw->draw_style_box(sb == style_selected ? style_selected : end_overlay, nr.node);
 		}
 
-		if (state_machine->get_end_node() == name) {
-			int endofs = nr.node.size.x - font->get_string_size(TTR("End"), font_size).x;
-			state_machine_draw->draw_string(font, offset + Vector2(endofs, -font->get_height(font_size) - 3 * EDSCALE + font->get_ascent(font_size)), TTR("End"), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
+		if (playing && (blend_from == name || current == name || travel_path.has(name))) {
+			state_machine_draw->draw_style_box(playing_overlay, nr.node);
 		}
 
 		offset.x += sb->get_offset().x;
@@ -775,13 +1377,14 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 		nr.play.position = offset + Vector2(0, (h - play->get_height()) / 2).floor();
 		nr.play.size = play->get_size();
 
-		Ref<Texture2D> play_tex = onstart ? auto_play : play;
+		Ref<Texture2D> play_tex = play;
 
 		if (over_node == name && over_node_what == 0) {
 			state_machine_draw->draw_texture(play_tex, nr.play.position, accent);
 		} else {
 			state_machine_draw->draw_texture(play_tex, nr.play.position);
 		}
+
 		offset.x += sep + play->get_width();
 
 		nr.name.position = offset + Vector2(0, (h - font->get_height(font_size)) / 2).floor();
@@ -803,6 +1406,11 @@ void AnimationNodeStateMachineEditor::_state_machine_draw() {
 		}
 	}
 
+	//draw box select
+	if (box_selecting) {
+		state_machine_draw->draw_rect(box_selecting_rect, Color(0.7, 0.7, 1.0, 0.3));
+	}
+
 	scroll_range.position -= state_machine_draw->get_size();
 	scroll_range.size += state_machine_draw->get_size() * 2.0;
 
@@ -829,6 +1437,10 @@ void AnimationNodeStateMachineEditor::_state_machine_pos_draw() {
 		return;
 	}
 
+	if (playback->get_current_node() == state_machine->start_node || playback->get_current_node() == state_machine->end_node) {
+		return;
+	}
+
 	int idx = -1;
 	for (int i = 0; i < node_rects.size(); i++) {
 		if (node_rects[i].node_name == playback->get_current_node()) {
@@ -902,8 +1514,8 @@ void AnimationNodeStateMachineEditor::_notification(int p_what) {
 			transition_mode->add_icon_item(get_theme_icon(SNAME("TransitionEnd"), SNAME("EditorIcons")), TTR("At End"));
 
 			tool_erase->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
-			tool_autoplay->set_icon(get_theme_icon(SNAME("AutoPlay"), SNAME("EditorIcons")));
-			tool_end->set_icon(get_theme_icon(SNAME("AutoEnd"), SNAME("EditorIcons")));
+			tool_group->set_icon(get_theme_icon(SNAME("Group"), SNAME("EditorIcons")));
+			tool_ungroup->set_icon(get_theme_icon(SNAME("Ungroup"), SNAME("EditorIcons")));
 
 			play_mode->clear();
 			play_mode->add_icon_item(get_theme_icon(SNAME("PlayTravel"), SNAME("EditorIcons")), TTR("Travel"));
@@ -1109,94 +1721,121 @@ void AnimationNodeStateMachineEditor::_scroll_changed(double) {
 	state_machine_draw->update();
 }
 
-void AnimationNodeStateMachineEditor::_erase_selected() {
-	if (selected_node != StringName() && state_machine->has_node(selected_node)) {
-		updating = true;
+void AnimationNodeStateMachineEditor::_erase_selected(const bool p_nested_action) {
+	if (!selected_nodes.is_empty()) {
+		if (!p_nested_action) {
+			updating = true;
+		}
 		undo_redo->create_action(TTR("Node Removed"));
-		undo_redo->add_do_method(state_machine.ptr(), "remove_node", selected_node);
-		undo_redo->add_undo_method(state_machine.ptr(), "add_node", selected_node, state_machine->get_node(selected_node), state_machine->get_node_position(selected_node));
-		for (int i = 0; i < state_machine->get_transition_count(); i++) {
-			String from = state_machine->get_transition_from(i);
-			String to = state_machine->get_transition_to(i);
-			if (from == selected_node || to == selected_node) {
-				undo_redo->add_undo_method(state_machine.ptr(), "add_transition", from, to, state_machine->get_transition(i));
+
+		for (int i = 0; i < node_rects.size(); i++) {
+			if (node_rects[i].node_name == state_machine->start_node || node_rects[i].node_name == state_machine->end_node) {
+				continue;
+			}
+
+			if (!selected_nodes.has(node_rects[i].node_name)) {
+				continue;
+			}
+
+			undo_redo->add_do_method(state_machine.ptr(), "remove_node", node_rects[i].node_name);
+			undo_redo->add_undo_method(state_machine.ptr(), "add_node", node_rects[i].node_name,
+					state_machine->get_node(node_rects[i].node_name),
+					state_machine->get_node_position(node_rects[i].node_name));
+
+			for (int j = 0; j < state_machine->get_transition_count(); j++) {
+				String from = state_machine->get_transition_from(j);
+				String to = state_machine->get_transition_to(j);
+				String local_from = from.get_slicec('/', 0);
+				String local_to = to.get_slicec('/', 0);
+
+				if (local_from == node_rects[i].node_name || local_to == node_rects[i].node_name) {
+					undo_redo->add_undo_method(state_machine.ptr(), "add_transition", from, to, state_machine->get_transition(j));
+				}
 			}
 		}
-		if (String(state_machine->get_start_node()) == selected_node) {
-			undo_redo->add_undo_method(state_machine.ptr(), "set_start_node", selected_node);
-		}
+
 		undo_redo->add_do_method(this, "_update_graph");
 		undo_redo->add_undo_method(this, "_update_graph");
 		undo_redo->commit_action();
-		updating = false;
-		selected_node = StringName();
+
+		if (!p_nested_action) {
+			updating = false;
+		}
+
+		selected_nodes.clear();
+	}
+
+	if (!selected_multi_transition.multi_transitions.is_empty()) {
+		delete_tree->clear();
+
+		TreeItem *root = delete_tree->create_item();
+
+		TreeItem *item = delete_tree->create_item(root);
+		item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
+		item->set_text(0, String(selected_transition_from) + " -> " + selected_transition_to);
+		item->set_editable(0, true);
+
+		for (int i = 0; i < selected_multi_transition.multi_transitions.size(); i++) {
+			String from = selected_multi_transition.multi_transitions[i].from_node;
+			String to = selected_multi_transition.multi_transitions[i].to_node;
+
+			item = delete_tree->create_item(root);
+			item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
+			item->set_text(0, from + " -> " + to);
+			item->set_editable(0, true);
+		}
+
+		delete_window->popup_centered(Vector2(400, 200));
+		return;
 	}
 
 	if (selected_transition_to != StringName() && selected_transition_from != StringName() && state_machine->has_transition(selected_transition_from, selected_transition_to)) {
 		Ref<AnimationNodeStateMachineTransition> tr = state_machine->get_transition(state_machine->find_transition(selected_transition_from, selected_transition_to));
-		updating = true;
+		if (!p_nested_action) {
+			updating = true;
+		}
 		undo_redo->create_action(TTR("Transition Removed"));
 		undo_redo->add_do_method(state_machine.ptr(), "remove_transition", selected_transition_from, selected_transition_to);
 		undo_redo->add_undo_method(state_machine.ptr(), "add_transition", selected_transition_from, selected_transition_to, tr);
 		undo_redo->add_do_method(this, "_update_graph");
 		undo_redo->add_undo_method(this, "_update_graph");
 		undo_redo->commit_action();
-		updating = false;
+		if (!p_nested_action) {
+			updating = false;
+		}
 		selected_transition_from = StringName();
 		selected_transition_to = StringName();
+		selected_transition_index = -1;
+		selected_multi_transition = TransitionLine();
 	}
 
 	state_machine_draw->update();
 }
 
-void AnimationNodeStateMachineEditor::_autoplay_selected() {
-	if (selected_node != StringName() && state_machine->has_node(selected_node)) {
-		StringName new_start_node;
-		if (state_machine->get_start_node() == selected_node) { //toggle it
-			new_start_node = StringName();
-		} else {
-			new_start_node = selected_node;
-		}
-
-		updating = true;
-		undo_redo->create_action(TTR("Set Start Node (Autoplay)"));
-		undo_redo->add_do_method(state_machine.ptr(), "set_start_node", new_start_node);
-		undo_redo->add_undo_method(state_machine.ptr(), "set_start_node", state_machine->get_start_node());
-		undo_redo->add_do_method(this, "_update_graph");
-		undo_redo->add_undo_method(this, "_update_graph");
-		undo_redo->commit_action();
-		updating = false;
-		state_machine_draw->update();
-	}
-}
-
-void AnimationNodeStateMachineEditor::_end_selected() {
-	if (selected_node != StringName() && state_machine->has_node(selected_node)) {
-		StringName new_end_node;
-		if (state_machine->get_end_node() == selected_node) { //toggle it
-			new_end_node = StringName();
-		} else {
-			new_end_node = selected_node;
-		}
-
-		updating = true;
-		undo_redo->create_action(TTR("Set Start Node (Autoplay)"));
-		undo_redo->add_do_method(state_machine.ptr(), "set_end_node", new_end_node);
-		undo_redo->add_undo_method(state_machine.ptr(), "set_end_node", state_machine->get_end_node());
-		undo_redo->add_do_method(this, "_update_graph");
-		undo_redo->add_undo_method(this, "_update_graph");
-		undo_redo->commit_action();
-		updating = false;
-		state_machine_draw->update();
-	}
-}
-
 void AnimationNodeStateMachineEditor::_update_mode() {
 	if (tool_select->is_pressed()) {
 		tool_erase_hb->show();
-		tool_erase->set_disabled(selected_node == StringName() && selected_transition_from == StringName() && selected_transition_to == StringName());
-		tool_autoplay->set_disabled(selected_node == StringName());
-		tool_end->set_disabled(selected_node == StringName());
+		bool nothing_selected = selected_nodes.is_empty() && selected_transition_from == StringName() && selected_transition_to == StringName();
+		bool start_end_selected = selected_nodes.size() == 1 && (selected_nodes.front()->get() == state_machine->start_node || selected_nodes.front()->get() == state_machine->end_node);
+		tool_erase->set_disabled(nothing_selected || start_end_selected);
+
+		if (selected_nodes.is_empty() || start_end_selected) {
+			tool_group->set_disabled(true);
+			tool_group->set_visible(true);
+			tool_ungroup->set_visible(false);
+		} else {
+			Ref<AnimationNodeStateMachine> ansm = state_machine->get_node(selected_nodes.front()->get());
+
+			if (selected_nodes.size() == 1 && ansm.is_valid()) {
+				tool_group->set_disabled(true);
+				tool_group->set_visible(false);
+				tool_ungroup->set_visible(true);
+			} else {
+				tool_group->set_disabled(false);
+				tool_group->set_visible(true);
+				tool_ungroup->set_visible(false);
+			}
+		}
 	} else {
 		tool_erase_hb->hide();
 	}
@@ -1204,10 +1843,13 @@ void AnimationNodeStateMachineEditor::_update_mode() {
 
 void AnimationNodeStateMachineEditor::_bind_methods() {
 	ClassDB::bind_method("_update_graph", &AnimationNodeStateMachineEditor::_update_graph);
-
 	ClassDB::bind_method("_removed_from_graph", &AnimationNodeStateMachineEditor::_removed_from_graph);
-
 	ClassDB::bind_method("_open_editor", &AnimationNodeStateMachineEditor::_open_editor);
+	ClassDB::bind_method("_connect_to", &AnimationNodeStateMachineEditor::_connect_to);
+	ClassDB::bind_method("_stop_connecting", &AnimationNodeStateMachineEditor::_stop_connecting);
+	ClassDB::bind_method("_delete_selected", &AnimationNodeStateMachineEditor::_delete_selected);
+	ClassDB::bind_method("_delete_all", &AnimationNodeStateMachineEditor::_delete_all);
+	ClassDB::bind_method("_delete_tree_draw", &AnimationNodeStateMachineEditor::_delete_tree_draw);
 }
 
 AnimationNodeStateMachineEditor *AnimationNodeStateMachineEditor::singleton = nullptr;
@@ -1227,7 +1869,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	tool_select->set_toggle_mode(true);
 	tool_select->set_button_group(bg);
 	tool_select->set_pressed(true);
-	tool_select->set_tooltip(TTR("Select and move nodes.\nRMB to add new nodes.\nShift+LMB to create connections."));
+	tool_select->set_tooltip(TTR("Select and move nodes.\nRMB: Add node at position clicked.\nShift+LMB+Drag: Connects the selected node with another node or creates a new node if you select an area without nodes."));
 	tool_select->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), varray(), CONNECT_DEFERRED);
 
 	tool_create = memnew(Button);
@@ -1249,28 +1891,27 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	tool_erase_hb = memnew(HBoxContainer);
 	top_hb->add_child(tool_erase_hb);
 	tool_erase_hb->add_child(memnew(VSeparator));
+
+	tool_group = memnew(Button);
+	tool_group->set_flat(true);
+	tool_group->set_tooltip(TTR("Group Selected Node(s)") + " (Ctrl+G)");
+	tool_group->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_group_selected_nodes));
+	tool_group->set_disabled(true);
+	tool_erase_hb->add_child(tool_group);
+
+	tool_ungroup = memnew(Button);
+	tool_ungroup->set_flat(true);
+	tool_ungroup->set_tooltip(TTR("Ungroup Selected Node") + " (Ctrl+Shift+G)");
+	tool_ungroup->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_ungroup_selected_nodes));
+	tool_ungroup->set_visible(false);
+	tool_erase_hb->add_child(tool_ungroup);
+
 	tool_erase = memnew(Button);
 	tool_erase->set_flat(true);
 	tool_erase->set_tooltip(TTR("Remove selected node or transition."));
-	tool_erase_hb->add_child(tool_erase);
-	tool_erase->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_erase_selected));
+	tool_erase->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_erase_selected), varray(false));
 	tool_erase->set_disabled(true);
-
-	tool_erase_hb->add_child(memnew(VSeparator));
-
-	tool_autoplay = memnew(Button);
-	tool_autoplay->set_flat(true);
-	tool_autoplay->set_tooltip(TTR("Toggle autoplay this animation on start, restart or seek to zero."));
-	tool_erase_hb->add_child(tool_autoplay);
-	tool_autoplay->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_autoplay_selected));
-	tool_autoplay->set_disabled(true);
-
-	tool_end = memnew(Button);
-	tool_end->set_flat(true);
-	tool_end->set_tooltip(TTR("Set the end animation. This is useful for sub-transitions."));
-	tool_erase_hb->add_child(tool_end);
-	tool_end->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_end_selected));
-	tool_end->set_disabled(true);
+	tool_erase_hb->add_child(tool_erase);
 
 	top_hb->add_child(memnew(VSeparator));
 	top_hb->add_child(memnew(Label(TTR("Transition: "))));
@@ -1326,12 +1967,28 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	menu = memnew(PopupMenu);
 	add_child(menu);
 	menu->connect("id_pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_add_menu_type));
+	menu->connect("popup_hide", callable_mp(this, &AnimationNodeStateMachineEditor::_stop_connecting));
 
 	animations_menu = memnew(PopupMenu);
 	menu->add_child(animations_menu);
 	animations_menu->set_name("animations");
 	animations_menu->connect("index_pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_add_animation_type));
 
+	connect_menu = memnew(PopupMenu);
+	add_child(connect_menu);
+	connect_menu->connect("id_pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_connect_to));
+	connect_menu->connect("popup_hide", callable_mp(this, &AnimationNodeStateMachineEditor::_stop_connecting));
+
+	state_machine_menu = memnew(PopupMenu);
+	state_machine_menu->set_name("state_machines");
+	state_machine_menu->connect("id_pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_connect_to));
+	connect_menu->add_child(state_machine_menu);
+
+	end_menu = memnew(PopupMenu);
+	end_menu->set_name("end_nodes");
+	end_menu->connect("id_pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_connect_to));
+	connect_menu->add_child(end_menu);
+
 	name_edit_popup = memnew(Popup);
 	add_child(name_edit_popup);
 	name_edit = memnew(LineEdit);
@@ -1346,4 +2003,95 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	open_file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
 	open_file->connect("file_selected", callable_mp(this, &AnimationNodeStateMachineEditor::_file_opened));
 	undo_redo = EditorNode::get_undo_redo();
+
+	delete_window = memnew(ConfirmationDialog);
+	delete_window->set_flag(Window::FLAG_RESIZE_DISABLED, true);
+	add_child(delete_window);
+
+	delete_tree = memnew(Tree);
+	delete_tree->set_hide_root(true);
+	delete_tree->connect("draw", callable_mp(this, &AnimationNodeStateMachineEditor::_delete_tree_draw));
+	delete_window->add_child(delete_tree);
+
+	Button *ok = delete_window->get_cancel_button();
+	ok->set_text(TTR("Delete Selected"));
+	ok->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_delete_selected));
+
+	Button *delete_all = delete_window->add_button(TTR("Delete All"), true);
+	delete_all->connect("pressed", callable_mp(this, &AnimationNodeStateMachineEditor::_delete_all));
+
+	over_node_what = -1;
+	dragging_selected_attempt = false;
+	connecting = false;
+	selected_transition_index = -1;
+
+	last_active = false;
+
+	error_time = 0;
+}
+
+void EditorAnimationMultiTransitionEdit::add_transition(const StringName &p_from, const StringName &p_to, Ref<AnimationNodeStateMachineTransition> p_transition) {
+	Transition tr;
+	tr.from = p_from;
+	tr.to = p_to;
+	tr.transition = p_transition;
+	transitions.push_back(tr);
+}
+
+bool EditorAnimationMultiTransitionEdit::_set(const StringName &p_name, const Variant &p_property) {
+	int index = String(p_name).get_slicec('/', 0).to_int();
+	StringName prop = String(p_name).get_slicec('/', 1);
+
+	bool found;
+	transitions.write[index].transition->set(prop, p_property, &found);
+	if (found) {
+		return true;
+	}
+
+	return false;
+}
+
+bool EditorAnimationMultiTransitionEdit::_get(const StringName &p_name, Variant &r_property) const {
+	int index = String(p_name).get_slicec('/', 0).to_int();
+	StringName prop = String(p_name).get_slicec('/', 1);
+
+	if (prop == "transition_path") {
+		r_property = String(transitions[index].from) + " -> " + transitions[index].to;
+		return true;
+	}
+
+	bool found;
+	r_property = transitions[index].transition->get(prop, &found);
+	if (found) {
+		return true;
+	}
+
+	return false;
+}
+
+void EditorAnimationMultiTransitionEdit::_get_property_list(List<PropertyInfo> *p_list) const {
+	for (int i = 0; i < transitions.size(); i++) {
+		List<PropertyInfo> plist;
+		transitions[i].transition->get_property_list(&plist, true);
+
+		PropertyInfo prop_transition_path;
+		prop_transition_path.type = Variant::STRING;
+		prop_transition_path.name = itos(i) + "/" + "transition_path";
+		p_list->push_back(prop_transition_path);
+
+		for (List<PropertyInfo>::Element *F = plist.front(); F; F = F->next()) {
+			if (F->get().name == "script" || F->get().name == "resource_name" || F->get().name == "resource_path" || F->get().name == "resource_local_to_scene") {
+				continue;
+			}
+
+			if (F->get().usage != PROPERTY_USAGE_DEFAULT) {
+				continue;
+			}
+
+			PropertyInfo prop = F->get();
+			prop.name = itos(i) + "/" + prop.name;
+
+			p_list->push_back(prop);
+		}
+	}
 }
diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h
index 16542a4a1a..1247d99389 100644
--- a/editor/plugins/animation_state_machine_editor.h
+++ b/editor/plugins/animation_state_machine_editor.h
@@ -50,13 +50,13 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	Button *tool_select = nullptr;
 	Button *tool_create = nullptr;
 	Button *tool_connect = nullptr;
+	Button *tool_group = nullptr;
+	Button *tool_ungroup = nullptr;
 	Popup *name_edit_popup = nullptr;
 	LineEdit *name_edit = nullptr;
 
 	HBoxContainer *tool_erase_hb = nullptr;
 	Button *tool_erase = nullptr;
-	Button *tool_autoplay = nullptr;
-	Button *tool_end = nullptr;
 
 	OptionButton *transition_mode = nullptr;
 	OptionButton *play_mode = nullptr;
@@ -64,6 +64,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	PanelContainer *panel = nullptr;
 
 	StringName selected_node;
+	Set<StringName> selected_nodes;
 
 	HScrollBar *h_scroll = nullptr;
 	VScrollBar *v_scroll = nullptr;
@@ -81,18 +82,31 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	static AnimationNodeStateMachineEditor *singleton;
 
 	void _state_machine_gui_input(const Ref<InputEvent> &p_event);
-	void _connection_draw(const Vector2 &p_from, const Vector2 &p_to, AnimationNodeStateMachineTransition::SwitchMode p_mode, bool p_enabled, bool p_selected, bool p_travel, bool p_auto_advance);
+	void _connection_draw(const Vector2 &p_from, const Vector2 &p_to, AnimationNodeStateMachineTransition::SwitchMode p_mode, bool p_enabled, bool p_selected, bool p_travel, bool p_auto_advance, bool p_multi_transitions);
 	void _state_machine_draw();
 	void _state_machine_pos_draw();
 
 	void _update_graph();
 
 	PopupMenu *menu = nullptr;
+	PopupMenu *connect_menu = nullptr;
+	PopupMenu *state_machine_menu = nullptr;
+	PopupMenu *end_menu = nullptr;
 	PopupMenu *animations_menu = nullptr;
 	Vector<String> animations_to_add;
+	Vector<String> nodes_to_connect;
 
 	Vector2 add_node_pos;
 
+	ConfirmationDialog *delete_window;
+	Tree *delete_tree;
+
+	bool box_selecting = false;
+	Point2 box_selecting_from;
+	Point2 box_selecting_to;
+	Rect2 box_selecting_rect;
+	Set<StringName> previous_selected;
+
 	bool dragging_selected_attempt = false;
 	bool dragging_selected = false;
 	Vector2 drag_from;
@@ -107,6 +121,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 
 	void _add_menu_type(int p_index);
 	void _add_animation_type(int p_index);
+	void _connect_to(int p_index);
 
 	void _removed_from_graph();
 
@@ -131,12 +146,34 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 		bool disabled = false;
 		bool auto_advance = false;
 		float width = 0;
+		bool selected;
+		bool travel;
+		bool hidden;
+		int transition_index;
+		Vector<TransitionLine> multi_transitions;
 	};
 
 	Vector<TransitionLine> transition_lines;
 
+	struct NodeUR {
+		StringName name;
+		Ref<AnimationNode> node;
+		Vector2 position;
+	};
+
+	struct TransitionUR {
+		StringName new_from;
+		StringName new_to;
+		StringName old_from;
+		StringName old_to;
+		Ref<AnimationNodeStateMachineTransition> transition;
+	};
+
 	StringName selected_transition_from;
 	StringName selected_transition_to;
+	int selected_transition_index;
+	TransitionLine selected_multi_transition;
+	void _add_transition(const bool p_nested_action = false);
 
 	StringName over_node;
 	int over_node_what = -1;
@@ -150,10 +187,19 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	void _clip_src_line_to_rect(Vector2 &r_from, const Vector2 &p_to, const Rect2 &p_rect);
 	void _clip_dst_line_to_rect(const Vector2 &p_from, Vector2 &r_to, const Rect2 &p_rect);
 
-	void _erase_selected();
+	void _erase_selected(const bool p_nested_action = false);
 	void _update_mode();
-	void _autoplay_selected();
-	void _end_selected();
+	void _open_menu(const Vector2 &p_position);
+	void _open_connect_menu(const Vector2 &p_position);
+	bool _create_submenu(PopupMenu *p_menu, Ref<AnimationNodeStateMachine> p_nodesm, const StringName &p_name, const StringName &p_path, bool from_root = false, Vector<Ref<AnimationNodeStateMachine>> p_parents = Vector<Ref<AnimationNodeStateMachine>>());
+	void _stop_connecting();
+
+	void _group_selected_nodes();
+	void _ungroup_selected_nodes();
+
+	void _delete_selected();
+	void _delete_all();
+	void _delete_tree_draw();
 
 	bool last_active = false;
 	StringName last_blend_from_node;
@@ -188,4 +234,26 @@ public:
 	AnimationNodeStateMachineEditor();
 };
 
+class EditorAnimationMultiTransitionEdit : public RefCounted {
+	GDCLASS(EditorAnimationMultiTransitionEdit, RefCounted);
+
+	struct Transition {
+		StringName from;
+		StringName to;
+		Ref<AnimationNodeStateMachineTransition> transition;
+	};
+
+	Vector<Transition> transitions;
+
+protected:
+	bool _set(const StringName &p_name, const Variant &p_property);
+	bool _get(const StringName &p_name, Variant &r_property) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+
+public:
+	void add_transition(const StringName &p_from, const StringName &p_to, Ref<AnimationNodeStateMachineTransition> p_transition);
+
+	EditorAnimationMultiTransitionEdit(){};
+};
+
 #endif // ANIMATION_STATE_MACHINE_EDITOR_H
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp
index 4f94ec3584..b3cae4f5b5 100644
--- a/scene/animation/animation_node_state_machine.cpp
+++ b/scene/animation/animation_node_state_machine.cpp
@@ -194,16 +194,20 @@ bool AnimationNodeStateMachinePlayback::_travel(AnimationNodeStateMachine *p_sta
 
 	//build open list
 	for (int i = 0; i < p_state_machine->transitions.size(); i++) {
-		if (p_state_machine->transitions[i].from == current) {
+		if (p_state_machine->transitions[i].transition->is_disabled()) {
+			continue;
+		}
+
+		if (p_state_machine->transitions[i].local_from == current) {
 			open_list.push_back(i);
-			float cost = p_state_machine->states[p_state_machine->transitions[i].to].position.distance_to(current_pos);
+			float cost = p_state_machine->states[p_state_machine->transitions[i].local_to].position.distance_to(current_pos);
 			cost *= p_state_machine->transitions[i].transition->get_priority();
 			AStarCost ap;
 			ap.prev = current;
 			ap.distance = cost;
-			cost_map[p_state_machine->transitions[i].to] = ap;
+			cost_map[p_state_machine->transitions[i].local_to] = ap;
 
-			if (p_state_machine->transitions[i].to == p_travel) { //prematurely found it! :D
+			if (p_state_machine->transitions[i].local_to == p_travel) { //prematurely found it! :D
 				path.push_back(p_travel);
 				return true;
 			}
@@ -222,8 +226,8 @@ bool AnimationNodeStateMachinePlayback::_travel(AnimationNodeStateMachine *p_sta
 		float least_cost = 1e20;
 
 		for (List<int>::Element *E = open_list.front(); E; E = E->next()) {
-			float cost = cost_map[p_state_machine->transitions[E->get()].to].distance;
-			cost += p_state_machine->states[p_state_machine->transitions[E->get()].to].position.distance_to(target_pos);
+			float cost = cost_map[p_state_machine->transitions[E->get()].local_to].distance;
+			cost += p_state_machine->states[p_state_machine->transitions[E->get()].local_to].position.distance_to(target_pos);
 
 			if (cost < least_cost) {
 				least_cost_transition = E;
@@ -231,34 +235,38 @@ bool AnimationNodeStateMachinePlayback::_travel(AnimationNodeStateMachine *p_sta
 			}
 		}
 
-		StringName transition_prev = p_state_machine->transitions[least_cost_transition->get()].from;
-		StringName transition = p_state_machine->transitions[least_cost_transition->get()].to;
+		StringName transition_prev = p_state_machine->transitions[least_cost_transition->get()].local_from;
+		StringName transition = p_state_machine->transitions[least_cost_transition->get()].local_to;
 
 		for (int i = 0; i < p_state_machine->transitions.size(); i++) {
-			if (p_state_machine->transitions[i].from != transition || p_state_machine->transitions[i].to == transition_prev) {
+			if (p_state_machine->transitions[i].transition->is_disabled()) {
+				continue;
+			}
+
+			if (p_state_machine->transitions[i].local_from != transition || p_state_machine->transitions[i].local_to == transition_prev) {
 				continue; //not interested on those
 			}
 
-			float distance = p_state_machine->states[p_state_machine->transitions[i].from].position.distance_to(p_state_machine->states[p_state_machine->transitions[i].to].position);
+			float distance = p_state_machine->states[p_state_machine->transitions[i].local_from].position.distance_to(p_state_machine->states[p_state_machine->transitions[i].local_to].position);
 			distance *= p_state_machine->transitions[i].transition->get_priority();
-			distance += cost_map[p_state_machine->transitions[i].from].distance;
+			distance += cost_map[p_state_machine->transitions[i].local_from].distance;
 
-			if (cost_map.has(p_state_machine->transitions[i].to)) {
+			if (cost_map.has(p_state_machine->transitions[i].local_to)) {
 				//oh this was visited already, can we win the cost?
-				if (distance < cost_map[p_state_machine->transitions[i].to].distance) {
-					cost_map[p_state_machine->transitions[i].to].distance = distance;
-					cost_map[p_state_machine->transitions[i].to].prev = p_state_machine->transitions[i].from;
+				if (distance < cost_map[p_state_machine->transitions[i].local_to].distance) {
+					cost_map[p_state_machine->transitions[i].local_to].distance = distance;
+					cost_map[p_state_machine->transitions[i].local_to].prev = p_state_machine->transitions[i].local_from;
 				}
 			} else {
 				//add to open list
 				AStarCost ac;
-				ac.prev = p_state_machine->transitions[i].from;
+				ac.prev = p_state_machine->transitions[i].local_from;
 				ac.distance = distance;
-				cost_map[p_state_machine->transitions[i].to] = ac;
+				cost_map[p_state_machine->transitions[i].local_to] = ac;
 
 				open_list.push_back(i);
 
-				if (p_state_machine->transitions[i].to == p_travel) {
+				if (p_state_machine->transitions[i].local_to == p_travel) {
 					found_route = true;
 					break;
 				}
@@ -397,7 +405,11 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s
 
 	if (path.size()) {
 		for (int i = 0; i < p_state_machine->transitions.size(); i++) {
-			if (p_state_machine->transitions[i].from == current && p_state_machine->transitions[i].to == path[0]) {
+			if (p_state_machine->transitions[i].transition->is_disabled()) {
+				continue;
+			}
+
+			if (p_state_machine->transitions[i].local_from == current && p_state_machine->transitions[i].local_to == path[0]) {
 				next_xfade = p_state_machine->transitions[i].transition->get_xfade_time();
 				switch_mode = p_state_machine->transitions[i].transition->get_switch_mode();
 				next = path[0];
@@ -406,17 +418,39 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s
 	} else {
 		float priority_best = 1e20;
 		int auto_advance_to = -1;
+
 		for (int i = 0; i < p_state_machine->transitions.size(); i++) {
-			bool auto_advance = false;
-			if (p_state_machine->transitions[i].transition->has_auto_advance()) {
-				auto_advance = true;
+			if (p_state_machine->transitions[i].transition->is_disabled()) {
+				continue;
 			}
-			StringName advance_condition_name = p_state_machine->transitions[i].transition->get_advance_condition_name();
-			if (advance_condition_name != StringName() && bool(p_state_machine->get_parameter(advance_condition_name))) {
-				auto_advance = true;
+
+			// handles end_node: when end_node is reached in a sub state machine, find and activate the current_transition
+			if (force_auto_advance) {
+				if (p_state_machine->transitions[i].from == current_transition.from && p_state_machine->transitions[i].to == current_transition.to) {
+					auto_advance_to = i;
+					force_auto_advance = false;
+					break;
+				}
 			}
 
-			if (p_state_machine->transitions[i].from == current && auto_advance) {
+			// handles start_node: if previous state machine is pointing to a node inside the current state machine, starts the current machine from start_node to prev_local_to
+			if (p_state_machine->start_node == current && p_state_machine->transitions[i].local_from == current) {
+				if (p_state_machine->prev_state_machine.is_valid()) {
+					Ref<AnimationNodeStateMachinePlayback> prev_playback = p_state_machine->prev_state_machine->get_parameter("playback");
+
+					if (prev_playback.is_valid()) {
+						StringName prev_local_to = String(prev_playback->current_transition.next).replace_first(String(p_state_machine->state_machine_name) + "/", "");
+
+						if (p_state_machine->transitions[i].to == prev_local_to) {
+							auto_advance_to = i;
+							prev_playback->current_transition.next = StringName();
+							break;
+						}
+					}
+				}
+			}
+
+			if (p_state_machine->transitions[i].from == current && _check_advance_condition(p_state_machine, p_state_machine->transitions[i].transition)) {
 				if (p_state_machine->transitions[i].transition->get_priority() <= priority_best) {
 					priority_best = p_state_machine->transitions[i].transition->get_priority();
 					auto_advance_to = i;
@@ -425,12 +459,55 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s
 		}
 
 		if (auto_advance_to != -1) {
-			next = p_state_machine->transitions[auto_advance_to].to;
+			next = p_state_machine->transitions[auto_advance_to].local_to;
+			Transition tr;
+			tr.from = String(p_state_machine->state_machine_name) + "/" + String(p_state_machine->transitions[auto_advance_to].from);
+			tr.to = String(p_state_machine->transitions[auto_advance_to].to).replace_first("../", "");
+			tr.next = p_state_machine->transitions[auto_advance_to].to;
+			current_transition = tr;
 			next_xfade = p_state_machine->transitions[auto_advance_to].transition->get_xfade_time();
 			switch_mode = p_state_machine->transitions[auto_advance_to].transition->get_switch_mode();
 		}
 	}
 
+	if (next == p_state_machine->end_node) {
+		Ref<AnimationNodeStateMachine> prev_state_machine = p_state_machine->prev_state_machine;
+
+		if (prev_state_machine.is_valid()) {
+			Ref<AnimationNodeStateMachinePlayback> prev_playback = prev_state_machine->get_parameter("playback");
+
+			if (prev_playback.is_valid()) {
+				if (next_xfade) {
+					prev_playback->current_transition = current_transition;
+					prev_playback->force_auto_advance = true;
+
+					return rem;
+				}
+				float priority_best = 1e20;
+				int auto_advance_to = -1;
+
+				for (int i = 0; i < prev_state_machine->transitions.size(); i++) {
+					if (prev_state_machine->transitions[i].transition->is_disabled()) {
+						continue;
+					}
+
+					if (current_transition.next == prev_state_machine->end_node && _check_advance_condition(prev_state_machine, prev_state_machine->transitions[i].transition)) {
+						if (prev_state_machine->transitions[i].transition->get_priority() <= priority_best) {
+							priority_best = prev_state_machine->transitions[i].transition->get_priority();
+							auto_advance_to = i;
+						}
+					}
+				}
+
+				if (auto_advance_to != -1) {
+					if (prev_state_machine->transitions[auto_advance_to].transition->get_xfade_time()) {
+						return rem;
+					}
+				}
+			}
+		}
+	}
+
 	//if next, see when to transition
 	if (next != StringName()) {
 		bool goto_next = false;
@@ -474,14 +551,35 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s
 		}
 	}
 
-	//compute time left for transitions by using the end node
-	if (p_state_machine->end_node != StringName() && p_state_machine->end_node != current) {
-		rem = p_state_machine->blend_node(p_state_machine->end_node, p_state_machine->states[p_state_machine->end_node].node, 0, true, 0, AnimationNode::FILTER_IGNORE, false);
+	// time left must always be 1 because the end node don't lenght to compute
+	if (p_state_machine->end_node != current) {
+		rem = 1;
+	} else {
+		Ref<AnimationNodeStateMachinePlayback> prev_playback = p_state_machine->prev_state_machine->get_parameter("playback");
+
+		if (prev_playback.is_valid()) {
+			prev_playback->current_transition = current_transition;
+			prev_playback->force_auto_advance = true;
+		}
 	}
 
 	return rem;
 }
 
+bool AnimationNodeStateMachinePlayback::_check_advance_condition(const Ref<AnimationNodeStateMachine> state_machine, const Ref<AnimationNodeStateMachineTransition> transition) const {
+	if (transition->has_auto_advance()) {
+		return true;
+	}
+
+	StringName advance_condition_name = transition->get_advance_condition_name();
+
+	if (advance_condition_name != StringName() && bool(state_machine->get_parameter(advance_condition_name))) {
+		return true;
+	}
+
+	return false;
+}
+
 void AnimationNodeStateMachinePlayback::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("travel", "to_node"), &AnimationNodeStateMachinePlayback::travel);
 	ClassDB::bind_method(D_METHOD("start", "node"), &AnimationNodeStateMachinePlayback::start);
@@ -513,6 +611,23 @@ void AnimationNodeStateMachine::get_parameter_list(List<PropertyInfo> *r_list) c
 	for (const StringName &E : advance_conditions) {
 		r_list->push_back(PropertyInfo(Variant::BOOL, E));
 	}
+
+	// for (const KeyValue<StringName, State> &E : states) {
+	// 	if (E->node == ansm) {
+	// 		for (int i = 0; i < E->node->transitions.size(); i++) {
+	// 			StringName ac = E->node->transitions[i].transition->get_advance_condition_name();
+	// 			if (ac != StringName() && advance_conditions.find(ac) == nullptr) {
+	// 				advance_conditions.push_back(ac);
+	// 			}
+	// 		}
+
+	// 		advance_conditions.sort_custom<StringName::AlphCompare>();
+
+	// 		for (const StringName &E : advance_conditions) {
+	// 			r_list->push_back(PropertyInfo(Variant::BOOL, E));
+	// 		}
+	// 	}
+	// }
 }
 
 Variant AnimationNodeStateMachine::get_parameter_default_value(const StringName &p_parameter) const {
@@ -536,6 +651,13 @@ void AnimationNodeStateMachine::add_node(const StringName &p_name, Ref<Animation
 
 	states[p_name] = state;
 
+	Ref<AnimationNodeStateMachine> anodesm = p_node;
+
+	if (anodesm.is_valid()) {
+		anodesm->state_machine_name = p_name;
+		anodesm->prev_state_machine = (Ref<AnimationNodeStateMachine>)this;
+	}
+
 	emit_changed();
 	emit_signal(SNAME("tree_changed"));
 
@@ -562,6 +684,14 @@ void AnimationNodeStateMachine::replace_node(const StringName &p_name, Ref<Anima
 	p_node->connect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed), varray(), CONNECT_REFERENCE_COUNTED);
 }
 
+bool AnimationNodeStateMachine::can_edit_node(const StringName &p_name) const {
+	if (states.has(p_name)) {
+		return !(states[p_name].node->is_class("AnimationNodeStartState") || states[p_name].node->is_class("AnimationNodeEndState"));
+	}
+
+	return true;
+}
+
 Ref<AnimationNode> AnimationNodeStateMachine::get_node(const StringName &p_name) const {
 	ERR_FAIL_COND_V(!states.has(p_name), Ref<AnimationNode>());
 
@@ -602,36 +732,24 @@ bool AnimationNodeStateMachine::has_node(const StringName &p_name) const {
 void AnimationNodeStateMachine::remove_node(const StringName &p_name) {
 	ERR_FAIL_COND(!states.has(p_name));
 
-	{
-		Ref<AnimationNode> node = states[p_name].node;
-
-		ERR_FAIL_COND(node.is_null());
-
-		node->disconnect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
+	if (!can_edit_node(p_name)) {
+		return;
 	}
 
-	states.erase(p_name);
-	//path.erase(p_name);
-
 	for (int i = 0; i < transitions.size(); i++) {
-		if (transitions[i].from == p_name || transitions[i].to == p_name) {
-			transitions.write[i].transition->disconnect("advance_condition_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
-			transitions.remove_at(i);
+		if (transitions[i].local_from == p_name || transitions[i].local_to == p_name) {
+			remove_transition_by_index(i);
 			i--;
 		}
 	}
 
-	if (start_node == p_name) {
-		start_node = StringName();
-	}
-
-	if (end_node == p_name) {
-		end_node = StringName();
+	{
+		Ref<AnimationNode> node = states[p_name].node;
+		ERR_FAIL_COND(node.is_null());
+		node->disconnect("tree_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
 	}
 
-	/*if (playing && current == p_name) {
-		stop();
-	}*/
+	states.erase(p_name);
 
 	emit_changed();
 	emit_signal(SNAME("tree_changed"));
@@ -640,39 +758,73 @@ void AnimationNodeStateMachine::remove_node(const StringName &p_name) {
 void AnimationNodeStateMachine::rename_node(const StringName &p_name, const StringName &p_new_name) {
 	ERR_FAIL_COND(!states.has(p_name));
 	ERR_FAIL_COND(states.has(p_new_name));
+	ERR_FAIL_COND(!can_edit_node(p_name));
 
 	states[p_new_name] = states[p_name];
 	states.erase(p_name);
 
+	Ref<AnimationNodeStateMachine> anodesm = states[p_new_name].node;
+	if (anodesm.is_valid()) {
+		anodesm->state_machine_name = p_new_name;
+	}
+
 	for (int i = 0; i < transitions.size(); i++) {
-		if (transitions[i].from == p_name) {
-			transitions.write[i].from = p_new_name;
+		if (transitions[i].local_from == p_name) {
+			_rename_transition(transitions[i].from, String(transitions[i].from).replace_first(p_name, p_new_name));
 		}
 
-		if (transitions[i].to == p_name) {
-			transitions.write[i].to = p_new_name;
+		if (transitions[i].local_to == p_name) {
+			_rename_transition(transitions[i].to, String(transitions[i].to).replace_first(p_name, p_new_name));
 		}
 	}
 
-	if (start_node == p_name) {
-		start_node = p_new_name;
-	}
+	emit_signal("tree_changed");
+}
 
-	if (end_node == p_name) {
-		end_node = p_new_name;
+void AnimationNodeStateMachine::_rename_transition(const StringName &p_name, const StringName &p_new_name) {
+	if (updating_transitions) {
+		return;
 	}
 
-	/*if (playing && current == p_name) {
-		current = p_new_name;
-	}*/
+	updating_transitions = true;
+	for (int i = 0; i < transitions.size(); i++) {
+		if (transitions[i].from == p_name) {
+			Vector<String> path = String(transitions[i].to).split("/");
+			if (path.size() > 1) {
+				if (path[0] == "..") {
+					prev_state_machine->_rename_transition(String(state_machine_name) + "/" + p_name, String(state_machine_name) + "/" + p_new_name);
+				} else {
+					((Ref<AnimationNodeStateMachine>)states[transitions[i].local_to].node)->_rename_transition("../" + p_name, "../" + p_new_name);
+				}
+			}
+
+			transitions.write[i].from = p_new_name;
+		}
 
-	//path.clear(); //clear path
-	emit_signal(SNAME("tree_changed"));
+		if (transitions[i].to == p_name) {
+			Vector<String> path = String(transitions[i].from).split("/");
+			if (path.size() > 1) {
+				if (path[0] == "..") {
+					prev_state_machine->_rename_transition(String(state_machine_name) + "/" + p_name, String(state_machine_name) + "/" + p_new_name);
+				} else {
+					((Ref<AnimationNodeStateMachine>)states[transitions[i].local_from].node)->_rename_transition("../" + p_name, "../" + p_new_name);
+				}
+			}
+
+			transitions.write[i].to = p_new_name;
+		}
+
+		updating_transitions = false;
+	}
 }
 
 void AnimationNodeStateMachine::get_node_list(List<StringName> *r_nodes) const {
 	List<StringName> nodes;
 	for (const KeyValue<StringName, State> &E : states) {
+		if (E.key == end_node && !prev_state_machine.is_valid()) {
+			continue;
+		}
+
 		nodes.push_back(E.key);
 	}
 	nodes.sort_custom<StringName::AlphCompare>();
@@ -682,9 +834,16 @@ void AnimationNodeStateMachine::get_node_list(List<StringName> *r_nodes) const {
 	}
 }
 
+Ref<AnimationNodeStateMachine> AnimationNodeStateMachine::get_prev_state_machine() const {
+	return prev_state_machine;
+}
+
 bool AnimationNodeStateMachine::has_transition(const StringName &p_from, const StringName &p_to) const {
+	StringName from = _get_shortest_path(p_from);
+	StringName to = _get_shortest_path(p_to);
+
 	for (int i = 0; i < transitions.size(); i++) {
-		if (transitions[i].from == p_from && transitions[i].to == p_to) {
+		if (transitions[i].from == from && transitions[i].to == to) {
 			return true;
 		}
 	}
@@ -692,32 +851,148 @@ bool AnimationNodeStateMachine::has_transition(const StringName &p_from, const S
 }
 
 int AnimationNodeStateMachine::find_transition(const StringName &p_from, const StringName &p_to) const {
+	StringName from = _get_shortest_path(p_from);
+	StringName to = _get_shortest_path(p_to);
+
 	for (int i = 0; i < transitions.size(); i++) {
-		if (transitions[i].from == p_from && transitions[i].to == p_to) {
+		if (transitions[i].from == from && transitions[i].to == to) {
 			return i;
 		}
 	}
 	return -1;
 }
 
+bool AnimationNodeStateMachine::_can_connect(const StringName &p_name, Vector<Ref<AnimationNodeStateMachine>> p_parents) const {
+	if (p_parents.is_empty()) {
+		Ref<AnimationNodeStateMachine> prev = (Ref<AnimationNodeStateMachine>)this;
+		while (prev.is_valid()) {
+			p_parents.push_back(prev);
+			prev = prev->prev_state_machine;
+		}
+	}
+
+	if (states.has(p_name)) {
+		Ref<AnimationNodeStateMachine> anodesm = states[p_name].node;
+
+		if (anodesm.is_valid() && p_parents.find(anodesm) != -1) {
+			return false;
+		}
+
+		return true;
+	}
+
+	String name = p_name;
+	Vector<String> path = name.split("/");
+
+	if (path.size() < 2) {
+		return false;
+	}
+
+	if (path[0] == "..") {
+		if (prev_state_machine.is_valid()) {
+			return prev_state_machine->_can_connect(name.replace_first("../", ""), p_parents);
+		}
+	} else if (states.has(path[0])) {
+		Ref<AnimationNodeStateMachine> anodesm = states[path[0]].node;
+		if (anodesm.is_valid()) {
+			return anodesm->_can_connect(name.replace_first(path[0] + "/", ""), p_parents);
+		}
+	}
+
+	return false;
+}
+
+StringName AnimationNodeStateMachine::_get_shortest_path(const StringName &p_path) const {
+	// If p_path is something like StateMachine/../StateMachine2/State1,
+	// the result will be StateMachine2/State1. This avoid duplicate
+	// transitions when using add_transition. eg, this two calls is the same:
+	//
+	// add_transition("State1", "StateMachine/../State2", tr)
+	// add_transition("State1", "State2", tr)
+	//
+	// but the second call must be invalid because the transition already exists
+
+	Vector<String> path = String(p_path).split("/");
+	Vector<String> new_path;
+
+	for (int i = 0; i < path.size(); i++) {
+		if (i > 0 && path[i] == ".." && new_path[i - 1] != "..") {
+			new_path.remove_at(i - 1);
+		} else {
+			new_path.push_back(path[i]);
+		}
+	}
+
+	String result;
+	for (int i = 0; i < new_path.size(); i++) {
+		result += new_path[i] + "/";
+	}
+	result.remove_at(result.length() - 1);
+
+	return result;
+}
+
 void AnimationNodeStateMachine::add_transition(const StringName &p_from, const StringName &p_to, const Ref<AnimationNodeStateMachineTransition> &p_transition) {
-	ERR_FAIL_COND(p_from == p_to);
-	ERR_FAIL_COND(!states.has(p_from));
-	ERR_FAIL_COND(!states.has(p_to));
+	if (updating_transitions) {
+		return;
+	}
+
+	StringName from = _get_shortest_path(p_from);
+	StringName to = _get_shortest_path(p_to);
+	Vector<String> path_from = String(from).split("/");
+	Vector<String> path_to = String(to).split("/");
+
+	ERR_FAIL_COND(from == end_node || to == start_node);
+	ERR_FAIL_COND(from == to);
+	ERR_FAIL_COND(!_can_connect(from));
+	ERR_FAIL_COND(!_can_connect(to));
 	ERR_FAIL_COND(p_transition.is_null());
 
 	for (int i = 0; i < transitions.size(); i++) {
-		ERR_FAIL_COND(transitions[i].from == p_from && transitions[i].to == p_to);
+		ERR_FAIL_COND(transitions[i].from == from && transitions[i].to == to);
 	}
 
+	if (path_from.size() > 1 || path_to.size() > 1) {
+		ERR_FAIL_COND(path_from[0] == path_to[0]);
+	}
+
+	updating_transitions = true;
+
+	StringName local_from = String(from).get_slicec('/', 0);
+	StringName local_to = String(to).get_slicec('/', 0);
+	local_from = local_from == ".." ? "Start" : local_from;
+	local_to = local_to == ".." ? "End" : local_to;
+
 	Transition tr;
-	tr.from = p_from;
-	tr.to = p_to;
+	tr.from = from;
+	tr.to = to;
+	tr.local_from = local_from;
+	tr.local_to = local_to;
 	tr.transition = p_transition;
 
 	tr.transition->connect("advance_condition_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed), varray(), CONNECT_REFERENCE_COUNTED);
 
 	transitions.push_back(tr);
+
+	// do recursive
+	if (path_from.size() > 1) {
+		StringName local_path = String(from).replace_first(path_from[0] + "/", "");
+		if (path_from[0] == "..") {
+			prev_state_machine->add_transition(local_path, String(state_machine_name) + "/" + to, p_transition);
+		} else {
+			((Ref<AnimationNodeStateMachine>)states[path_from[0]].node)->add_transition(local_path, "../" + to, p_transition);
+		}
+	}
+	if (path_to.size() > 1) {
+		StringName local_path = String(to).replace_first(path_to[0] + "/", "");
+		if (path_to[0] == "..") {
+			prev_state_machine->add_transition(String(state_machine_name) + "/" + from, local_path, p_transition);
+		} else {
+			((Ref<AnimationNodeStateMachine>)states[path_to[0]].node)->add_transition("../" + from, local_path, p_transition);
+		}
+	}
+
+	updating_transitions = false;
 }
 
 Ref<AnimationNodeStateMachineTransition> AnimationNodeStateMachine::get_transition(int p_transition) const {
@@ -740,44 +1015,52 @@ int AnimationNodeStateMachine::get_transition_count() const {
 }
 
 void AnimationNodeStateMachine::remove_transition(const StringName &p_from, const StringName &p_to) {
+	StringName from = _get_shortest_path(p_from);
+	StringName to = _get_shortest_path(p_to);
+
 	for (int i = 0; i < transitions.size(); i++) {
-		if (transitions[i].from == p_from && transitions[i].to == p_to) {
-			transitions.write[i].transition->disconnect("advance_condition_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
-			transitions.remove_at(i);
+		if (transitions[i].from == from && transitions[i].to == to) {
+			remove_transition_by_index(i);
 			return;
 		}
 	}
-
-	/*if (playing) {
-		path.clear();
-	}*/
 }
 
-void AnimationNodeStateMachine::remove_transition_by_index(int p_transition) {
+void AnimationNodeStateMachine::remove_transition_by_index(const int p_transition) {
 	ERR_FAIL_INDEX(p_transition, transitions.size());
+	Transition tr = transitions[p_transition];
 	transitions.write[p_transition].transition->disconnect("advance_condition_changed", callable_mp(this, &AnimationNodeStateMachine::_tree_changed));
 	transitions.remove_at(p_transition);
-	/*if (playing) {
-		path.clear();
-	}*/
-}
 
-void AnimationNodeStateMachine::set_start_node(const StringName &p_node) {
-	ERR_FAIL_COND(p_node != StringName() && !states.has(p_node));
-	start_node = p_node;
-}
+	Vector<String> path_from = String(tr.from).split("/");
+	Vector<String> path_to = String(tr.to).split("/");
 
-String AnimationNodeStateMachine::get_start_node() const {
-	return start_node;
-}
+	List<Vector<String>> paths;
+	paths.push_back(path_from);
+	paths.push_back(path_to);
 
-void AnimationNodeStateMachine::set_end_node(const StringName &p_node) {
-	ERR_FAIL_COND(p_node != StringName() && !states.has(p_node));
-	end_node = p_node;
+	for (List<Vector<String>>::Element *E = paths.front(); E; E = E->next()) {
+		if (E->get()[0].size() > 1) {
+			if (E->get()[0] == "..") {
+				prev_state_machine->_remove_transition(tr.transition);
+			} else if (states.has(E->get()[0])) {
+				Ref<AnimationNodeStateMachine> anodesm = states[E->get()[0]].node;
+
+				if (anodesm.is_valid()) {
+					anodesm->_remove_transition(tr.transition);
+				}
+			}
+		}
+	}
 }
 
-String AnimationNodeStateMachine::get_end_node() const {
-	return end_node;
+void AnimationNodeStateMachine::_remove_transition(const Ref<AnimationNodeStateMachineTransition> p_transition) {
+	for (int i = 0; i < transitions.size(); i++) {
+		if (transitions[i].transition == p_transition) {
+			remove_transition_by_index(i);
+			return;
+		}
+	}
 }
 
 void AnimationNodeStateMachine::set_graph_offset(const Vector2 &p_offset) {
@@ -799,6 +1082,18 @@ String AnimationNodeStateMachine::get_caption() const {
 	return "StateMachine";
 }
 
+bool AnimationNodeStateMachine::has_local_transition(const StringName &p_from, const StringName &p_to) const {
+	StringName from = _get_shortest_path(p_from);
+	StringName to = _get_shortest_path(p_to);
+
+	for (int i = 0; i < transitions.size(); i++) {
+		if (transitions[i].local_from == from && transitions[i].local_to == to) {
+			return true;
+		}
+	}
+	return false;
+}
+
 Ref<AnimationNode> AnimationNodeStateMachine::get_child_by_name(const StringName &p_name) {
 	return get_node(p_name);
 }
@@ -831,12 +1126,6 @@ bool AnimationNodeStateMachine::_set(const StringName &p_name, const Variant &p_
 			add_transition(trans[i], trans[i + 1], trans[i + 2]);
 		}
 		return true;
-	} else if (name == "start_node") {
-		set_start_node(p_value);
-		return true;
-	} else if (name == "end_node") {
-		set_end_node(p_value);
-		return true;
 	} else if (name == "graph_offset") {
 		set_graph_offset(p_value);
 		return true;
@@ -852,7 +1141,7 @@ bool AnimationNodeStateMachine::_get(const StringName &p_name, Variant &r_ret) c
 		String what = name.get_slicec('/', 2);
 
 		if (what == "node") {
-			if (states.has(node_name)) {
+			if (states.has(node_name) && can_edit_node(node_name)) {
 				r_ret = states[node_name].node;
 				return true;
 			}
@@ -866,22 +1155,21 @@ bool AnimationNodeStateMachine::_get(const StringName &p_name, Variant &r_ret) c
 		}
 	} else if (name == "transitions") {
 		Array trans;
-		trans.resize(transitions.size() * 3);
-
 		for (int i = 0; i < transitions.size(); i++) {
-			trans[i * 3 + 0] = transitions[i].from;
-			trans[i * 3 + 1] = transitions[i].to;
-			trans[i * 3 + 2] = transitions[i].transition;
+			String from = transitions[i].from;
+			String to = transitions[i].to;
+
+			if (from.get_slicec('/', 0) == ".." || to.get_slicec('/', 0) == "..") {
+				continue;
+			}
+
+			trans.push_back(from);
+			trans.push_back(to);
+			trans.push_back(transitions[i].transition);
 		}
 
 		r_ret = trans;
 		return true;
-	} else if (name == "start_node") {
-		r_ret = get_start_node();
-		return true;
-	} else if (name == "end_node") {
-		r_ret = get_end_node();
-		return true;
 	} else if (name == "graph_offset") {
 		r_ret = get_graph_offset();
 		return true;
@@ -903,8 +1191,6 @@ void AnimationNodeStateMachine::_get_property_list(List<PropertyInfo> *p_list) c
 	}
 
 	p_list->push_back(PropertyInfo(Variant::ARRAY, "transitions", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
-	p_list->push_back(PropertyInfo(Variant::STRING_NAME, "start_node", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
-	p_list->push_back(PropertyInfo(Variant::STRING_NAME, "end_node", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 	p_list->push_back(PropertyInfo(Variant::VECTOR2, "graph_offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR));
 }
 
@@ -912,10 +1198,24 @@ void AnimationNodeStateMachine::reset_state() {
 	states.clear();
 	transitions.clear();
 	playback = "playback";
-	start_node = StringName();
-	end_node = StringName();
+	start_node = "Start";
+	end_node = "End";
 	graph_offset = Vector2();
 
+	Ref<AnimationNodeStartState> s;
+	s.instantiate();
+	State start;
+	start.node = s;
+	start.position = Vector2(200, 100);
+	states[start_node] = start;
+
+	Ref<AnimationNodeEndState> e;
+	e.instantiate();
+	State end;
+	end.node = e;
+	end.position = Vector2(900, 100);
+	states[end_node] = end;
+
 	emit_changed();
 	emit_signal(SNAME("tree_changed"));
 }
@@ -955,15 +1255,22 @@ void AnimationNodeStateMachine::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("remove_transition_by_index", "idx"), &AnimationNodeStateMachine::remove_transition_by_index);
 	ClassDB::bind_method(D_METHOD("remove_transition", "from", "to"), &AnimationNodeStateMachine::remove_transition);
 
-	ClassDB::bind_method(D_METHOD("set_start_node", "name"), &AnimationNodeStateMachine::set_start_node);
-	ClassDB::bind_method(D_METHOD("get_start_node"), &AnimationNodeStateMachine::get_start_node);
-
-	ClassDB::bind_method(D_METHOD("set_end_node", "name"), &AnimationNodeStateMachine::set_end_node);
-	ClassDB::bind_method(D_METHOD("get_end_node"), &AnimationNodeStateMachine::get_end_node);
-
 	ClassDB::bind_method(D_METHOD("set_graph_offset", "offset"), &AnimationNodeStateMachine::set_graph_offset);
 	ClassDB::bind_method(D_METHOD("get_graph_offset"), &AnimationNodeStateMachine::get_graph_offset);
 }
 
 AnimationNodeStateMachine::AnimationNodeStateMachine() {
+	Ref<AnimationNodeStartState> s;
+	s.instantiate();
+	State start;
+	start.node = s;
+	start.position = Vector2(200, 100);
+	states[start_node] = start;
+
+	Ref<AnimationNodeEndState> e;
+	e.instantiate();
+	State end;
+	end.node = e;
+	end.position = Vector2(900, 100);
+	states[end_node] = end;
 }
diff --git a/scene/animation/animation_node_state_machine.h b/scene/animation/animation_node_state_machine.h
index 96add7f538..39a84358fb 100644
--- a/scene/animation/animation_node_state_machine.h
+++ b/scene/animation/animation_node_state_machine.h
@@ -93,13 +93,19 @@ class AnimationNodeStateMachinePlayback : public Resource {
 		StringName prev;
 	};
 
-	float len_total = 0.0;
+	struct Transition {
+		StringName from;
+		StringName to;
+		StringName next;
+	};
 
 	float len_current = 0.0;
 	float pos_current = 0.0;
 	bool end_loop = false;
 
 	StringName current;
+	Transition current_transition;
+	bool force_auto_advance = false;
 
 	StringName fading_from;
 	float fading_time = 0.0;
@@ -116,6 +122,8 @@ class AnimationNodeStateMachinePlayback : public Resource {
 
 	double process(AnimationNodeStateMachine *p_state_machine, double p_time, bool p_seek);
 
+	bool _check_advance_condition(const Ref<AnimationNodeStateMachine> p_state_machine, const Ref<AnimationNodeStateMachineTransition> p_transition) const;
+
 protected:
 	static void _bind_methods();
 
@@ -149,19 +157,25 @@ private:
 	struct Transition {
 		StringName from;
 		StringName to;
+		StringName local_from;
+		StringName local_to;
 		Ref<AnimationNodeStateMachineTransition> transition;
 	};
 
 	Vector<Transition> transitions;
 
 	StringName playback = "playback";
-
-	StringName start_node;
-	StringName end_node;
+	StringName state_machine_name;
+	Ref<AnimationNodeStateMachine> prev_state_machine;
+	bool updating_transitions = false;
 
 	Vector2 graph_offset;
 
 	void _tree_changed();
+	void _remove_transition(const Ref<AnimationNodeStateMachineTransition> p_transition);
+	void _rename_transition(const StringName &p_name, const StringName &p_new_name);
+	bool _can_connect(const StringName &p_name, const Vector<Ref<AnimationNodeStateMachine>> p_parents = Vector<Ref<AnimationNodeStateMachine>>()) const;
+	StringName _get_shortest_path(const StringName &p_path) const;
 
 protected:
 	static void _bind_methods();
@@ -169,10 +183,14 @@ protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	void _get_property_list(List<PropertyInfo> *p_list) const;
+	bool _check_advance_condition(const Ref<AnimationNodeStateMachine> p_state_machine, const Ref<AnimationNodeStateMachineTransition> p_transition) const;
 
 	virtual void reset_state() override;
 
 public:
+	StringName start_node = "Start";
+	StringName end_node = "End";
+
 	virtual void get_parameter_list(List<PropertyInfo> *r_list) const override;
 	virtual Variant get_parameter_default_value(const StringName &p_parameter) const override;
 
@@ -191,20 +209,19 @@ public:
 	virtual void get_child_nodes(List<ChildNode> *r_child_nodes) override;
 
 	bool has_transition(const StringName &p_from, const StringName &p_to) const;
+	bool has_local_transition(const StringName &p_from, const StringName &p_to) const;
 	int find_transition(const StringName &p_from, const StringName &p_to) const;
 	void add_transition(const StringName &p_from, const StringName &p_to, const Ref<AnimationNodeStateMachineTransition> &p_transition);
 	Ref<AnimationNodeStateMachineTransition> get_transition(int p_transition) const;
 	StringName get_transition_from(int p_transition) const;
 	StringName get_transition_to(int p_transition) const;
 	int get_transition_count() const;
-	void remove_transition_by_index(int p_transition);
+	void remove_transition_by_index(const int p_transition);
 	void remove_transition(const StringName &p_from, const StringName &p_to);
 
-	void set_start_node(const StringName &p_node);
-	String get_start_node() const;
+	bool can_edit_node(const StringName &p_name) const;
 
-	void set_end_node(const StringName &p_node);
-	String get_end_node() const;
+	Ref<AnimationNodeStateMachine> get_prev_state_machine() const;
 
 	void set_graph_offset(const Vector2 &p_offset);
 	Vector2 get_graph_offset() const;
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index e61a297b04..3f09bf7f4b 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -37,6 +37,8 @@
 #include "scene/resources/animation.h"
 
 class AnimationNodeBlendTree;
+class AnimationNodeStartState;
+class AnimationNodeEndState;
 class AnimationPlayer;
 class AnimationTree;
 
@@ -164,6 +166,14 @@ public:
 	AnimationRootNode() {}
 };
 
+class AnimationNodeStartState : public AnimationRootNode {
+	GDCLASS(AnimationNodeStartState, AnimationRootNode);
+};
+
+class AnimationNodeEndState : public AnimationRootNode {
+	GDCLASS(AnimationNodeEndState, AnimationRootNode);
+};
+
 class AnimationTree : public Node {
 	GDCLASS(AnimationTree, Node);