offloading remaining progress from desktop

4 files changed, 31 insertions, 1 deletions

diff --git a/export_presets.cfg b/export_presets.cfg
new file mode 100644
index 0000000..6abd50a
--- /dev/null
+++ b/export_presets.cfg
@@ -0,0 +1,24 @@
+[preset.0]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="export/boats.x86_64"
+script_export_mode=1
+script_encryption_key=""
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+binary_format/64_bits=true
+binary_format/embed_pck=false
+texture_format/bptc=false
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+texture_format/no_bptc_fallbacks=true
diff --git a/project.godot b/project.godot
index 738d81b..1e71650 100644
--- a/project.godot
+++ b/project.godot
@@ -14,8 +14,13 @@ config/name="boats"
 run/main_scene="res://ui/MainMenu.tscn"
 config/icon="res://icon.png"
 
+[debug]
+
+settings/stdout/print_fps=true
+
 [display]
 
+window/vsync/use_vsync=false
 window/stretch/mode="2d"
 
 [input]
diff --git a/scripts/Server.gd b/scripts/Server.gd
index 2814b7b..731663c 100644
--- a/scripts/Server.gd
+++ b/scripts/Server.gd
@@ -102,7 +102,8 @@ func _client_request_change_character(arguments):
 func _client_request_control_vehicle(arguments):
 	var dest_machine = world.get_node("MACHINES/"+arguments["machine"])
 	if dest_machine != null and dest_machine.get_network_master() == 1 and !dest_machine.in_use:
-		pass
+		print_line(connected_players[arguments["id"]][0] + " is controlling " + arguments["machine"])
+		dest_machine.rpc("set_net_owner", arguments["id"])
 
 func _character_death(arguments):
 	var victim_player = connected_players[arguments["victim_mp_id"]][0] if arguments["victim_mp_id"] != 1 else ""
diff --git a/work/progress_chart.xlsx b/work/progress_chart.xlsx
index b72f670..7e99b9a 100644
--- a/work/progress_chart.xlsx
+++ b/work/progress_chart.xlsx