diff --git a/.gitignore b/.gitignore index 3efc609..cc229f2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ export_presets.cfg # Mono-specific ignores .mono/ data_*/ + *.import diff --git a/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.md5 b/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.md5 deleted file mode 100644 index 3bec12e..0000000 --- a/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="952a962f6d20acc3a10ace9f4b0baaca" -dest_md5="b89d6940e050aef38a2c90c450d3bf94" - diff --git a/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.scn b/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.scn deleted file mode 100644 index 8bc991b..0000000 Binary files a/.import/Handgun.gltf-dfc6de5a6d72ba5ef43f43a4cd2ab91e.scn and /dev/null differ diff --git a/Game.gd b/Game.gd index 4bf1315..8f0439c 100644 --- a/Game.gd +++ b/Game.gd @@ -101,6 +101,9 @@ func join_jan(): SERVER_IP = "172.25.166.24" initialize_client() +func set_ip(ip): + SERVER_IP = ip + func set_mouse_sensitivity(sensitivity_multiplier, save=true): if mouse_sensitivity_multiplier != sensitivity_multiplier: mouse_sensitivity_multiplier = sensitivity_multiplier diff --git a/Game.tscn b/Game.tscn index 111a32a..3d57adf 100644 --- a/Game.tscn +++ b/Game.tscn @@ -219,6 +219,7 @@ margin_right = 300.0 margin_bottom = 64.0 text = "Fullscreen" [connection signal="pressed" from="MenuContainer/MainMenu/QuickJoin" to="." method="open_menu" binds= [ "QuickJoinMenu" ]] +[connection signal="text_changed" from="MenuContainer/MainMenu/Destination/IPAdress" to="." method="set_ip"] [connection signal="pressed" from="MenuContainer/MainMenu/NetworkType/Host" to="." method="initialize_server"] [connection signal="pressed" from="MenuContainer/MainMenu/NetworkType/Join" to="." method="initialize_client"] [connection signal="pressed" from="MenuContainer/MainMenu/Options" to="." method="open_menu" binds= [ "OptionsMenu" ]]