Add back buttons to all submenus

scenes/custom_game.tscn

@@ -36,7 +36,7 @@ anchor_bottom = 0.0
 margin_left = 498.0
 margin_top = 140.0
 margin_right = 518.0
-margin_bottom = 563.0
+margin_bottom = 481.0
 rect_pivot_offset = Vector2( 0, 0 )
 mouse_filter = 0
 mouse_default_cursor_shape = 0
@@ -205,4 +205,28 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
+[node name="Back" type="Button" parent="." index="8"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 437.0
+margin_top = 509.0
+margin_right = 581.0
+margin_bottom = 537.0
+rect_pivot_offset = Vector2( 0, 0 )
+focus_mode = 2
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+toggle_mode = false
+enabled_focus_mode = 2
+shortcut = null
+group = null
+text = "Back to menu"
+flat = false
+align = 1
+
 

scenes/lobby.tscn

@@ -317,5 +317,29 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 
+[node name="Back" type="Button" parent="." index="10"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 834.0
+margin_top = 443.0
+margin_right = 978.0
+margin_bottom = 471.0
+rect_pivot_offset = Vector2( 0, 0 )
+focus_mode = 2
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+toggle_mode = false
+enabled_focus_mode = 2
+shortcut = null
+group = null
+text = "Exit to menu"
+flat = false
+align = 1
+
 
 [editable path="HeroSelect"]

scenes/menu.tscn

@@ -139,4 +139,28 @@ text = "Practice Range"
 flat = false
 align = 1
 
+[node name="Quit" type="Button" parent="Center" index="3"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = -252.0
+margin_top = 200.0
+margin_right = 298.0
+margin_bottom = 266.0
+rect_pivot_offset = Vector2( 0, 0 )
+focus_mode = 2
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+toggle_mode = false
+enabled_focus_mode = 2
+shortcut = null
+group = null
+text = "Quit"
+flat = false
+align = 1
+
 

scripts/custom_game.gd

@@ -3,6 +3,7 @@ extends Control
 func _ready():
 	get_node("Server").connect("pressed", self, "_start_server")
 	get_node("Client").connect("pressed", self, "_start_client")
+	get_node("Back").connect("pressed", get_tree(), "change_scene", ["res://scenes/menu.tscn"])
 
 func _start_server():
 	# Custom Game can assume we're playing as well
@@ -11,4 +12,3 @@ func _start_server():
 func _start_client():
 	var ip = get_node("IP").text
 	networking.start_client(ip)
-

scripts/lobby.gd

@@ -16,6 +16,7 @@ func _ready():
 	get_node("Spectating").connect("toggled", self, "_set_info_callback", ["spectating"])
 	ready_button.connect("toggled", self, "_set_info_callback", ["ready"])
 	start_game_button.connect("pressed", networking, "start_game")
+	get_node("Back").connect("pressed", self, "_exit_to_menu")
 	# Shown, maybe, in _check_begun
 	start_game_button.hide()
 	if get_tree().is_network_server():
@@ -97,3 +98,7 @@ func render_player_list():
 			list += "\n"
 	get_node("PlayerList").set_text(list)
 
+func _exit_to_menu():
+	get_tree().network_peer.close_connection()
+	get_tree().change_scene("res://scenes/menu.tscn")
+

scripts/menu.gd

@@ -11,6 +11,7 @@ func _gui_setup():
 	get_node("Center/Play").connect("pressed", self, "_find_game")
 	get_node("Center/CustomGame").connect("pressed", self, "_custom_game")
 	get_node("Center/Singleplayer").connect("pressed", self, "_singleplayer")
+	get_node("Center/Quit").connect("pressed", get_tree(), "quit")
 
 func _find_game():
 	# var ip = networking.global_server_ip