diff --git a/default_bus_layout.tres b/default_bus_layout.tres index d246562e..3961658d 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -6,7 +6,7 @@ resource_name = "Record" [resource] bus/1/name = &"Record" bus/1/solo = false -bus/1/mute = true +bus/1/mute = false bus/1/bypass_fx = false bus/1/volume_db = 0.0 bus/1/send = &"Master" diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd index b0f599e2..c4e8a25e 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.gd @@ -30,7 +30,7 @@ func _on_join_button_pressed(): main_menu.hide() hud.show() print("here2") - var address + var address = address_entry.text if address_entry.text == "": address = "localhost" diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.tscn b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.tscn index 947677fc..85cedd02 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.tscn +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.tscn @@ -24,7 +24,7 @@ bg_color = Color(1, 0.117647, 0, 1) [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cf32s"] bg_color = Color(0.00392157, 1, 0, 1) -[sub_resource type="AudioStreamMicrophone" id="AudioStreamMicrophone_h1sb2"] +[sub_resource type="AudioStreamMicrophone" id="AudioStreamMicrophone_mf6rc"] [node name="Node2D" type="Node2D"] script = ExtResource("1_1h20w") @@ -128,16 +128,16 @@ text = "Amp: 0" script = ExtResource("22_4qbxk") [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."] -_spawnable_scenes = PackedStringArray("res://prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/player.tscn") +_spawnable_scenes = PackedStringArray("res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn") spawn_path = NodePath("..") +[node name="environment" parent="." instance=ExtResource("4_ajv8v")] + [node name="AudioStreamRecord" type="AudioStreamPlayer" parent="."] -stream = SubResource("AudioStreamMicrophone_h1sb2") +stream = SubResource("AudioStreamMicrophone_mf6rc") autoplay = true bus = &"Record" -[node name="environment" parent="." instance=ExtResource("4_ajv8v")] - [connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/HostButton" to="." method="_on_host_button_pressed"] [connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/JoinButton" to="." method="_on_join_button_pressed"] [connection signal="spawned" from="MultiplayerSpawner" to="." method="_on_multiplayer_spawner_spawned"] diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/jumpnrun_template.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/jumpnrun_template.gd index ea6ba109..939c7878 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/jumpnrun_template.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/jumpnrun_template.gd @@ -10,7 +10,6 @@ var key_map = { func _ready(): $TileMap.material.set_light_mode(2) $TileMap2.material.set_light_mode(2) - if not is_multiplayer_authority(): return camera.make_current() func restart_game(): diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn index 24ac1616..08d58e8e 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/player.tscn @@ -1,11 +1,11 @@ -[gd_scene load_steps=9 format=3 uid="uid://cvts5gthbl0sq"] +[gd_scene load_steps=8 format=3 uid="uid://cvts5gthbl0sq"] [ext_resource type="Script" path="res://addons/pronto/behaviors/PlaceholderBehavior.gd" id="1_8sxcg"] [ext_resource type="Script" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/Player.gd" id="2_scvjl"] [ext_resource type="Script" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/CameraPlayer.gd" id="8_xrvh5"] [ext_resource type="Texture2D" uid="uid://coiaxftxa6ket" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/resources/images/Light.png" id="9_fo443"] -[sub_resource type="Image" id="Image_b56tg"] +[sub_resource type="Image" id="Image_nymhq"] data = { "data": PackedByteArray(249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0), "format": "RGBA8", @@ -15,9 +15,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_0052l"] -image = SubResource("Image_b56tg") - -[sub_resource type="AudioStreamMicrophone" id="AudioStreamMicrophone_r482t"] +image = SubResource("Image_nymhq") [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_tugnh"] properties/0/path = NodePath(".:position") @@ -43,11 +41,6 @@ position = Vector2(-3, -84) zoom = Vector2(1.795, 1.795) script = ExtResource("8_xrvh5") -[node name="AudioStreamRecord" type="AudioStreamPlayer" parent="."] -stream = SubResource("AudioStreamMicrophone_r482t") -autoplay = true -bus = &"Record" - [node name="PointLight2D" type="PointLight2D" parent="."] blend_mode = 2 texture = ExtResource("9_fo443") diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn index 493e21f9..bdde4e91 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/world.tscn @@ -20,7 +20,7 @@ particles_anim_loop = false [sub_resource type="RectangleShape2D" id="RectangleShape2D_d1mxw"] size = Vector2(831, 36) -[sub_resource type="Image" id="Image_e7dng"] +[sub_resource type="Image" id="Image_rby6c"] data = { "data": PackedByteArray(249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 255, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0, 249, 250, 251, 0), "format": "RGBA8", @@ -30,7 +30,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_4bga1"] -image = SubResource("Image_e7dng") +image = SubResource("Image_rby6c") [node name="World" type="Node2D"] diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/environment.tscn b/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/environment.tscn index 58afc047..faa912d1 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/environment.tscn +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/environment.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://c1j7an8woikyd"] -[ext_resource type="PackedScene" uid="uid://ckf3250w8jpro" path="res://models/Environment.glb" id="1_p4eel"] -[ext_resource type="Texture2D" uid="uid://bugwfwhpqfp1n" path="res://addons/kenney_prototype_textures/dark/texture_09.png" id="2_dpxbx"] -[ext_resource type="Texture2D" uid="uid://1opha1cxcimy" path="res://addons/kenney_prototype_textures/orange/texture_10.png" id="3_tbg6f"] +[ext_resource type="PackedScene" uid="uid://ckf3250w8jpro" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/models/Environment.glb" id="1_p4eel"] +[ext_resource type="Texture2D" uid="uid://bugwfwhpqfp1n" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/addons/kenney_prototype_textures/dark/texture_09.png" id="2_dpxbx"] +[ext_resource type="Texture2D" uid="uid://1opha1cxcimy" path="res://prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/addons/kenney_prototype_textures/orange/texture_10.png" id="3_tbg6f"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_if5ix"] albedo_texture = ExtResource("2_dpxbx") @@ -14,6 +14,6 @@ uv1_triplanar = true [node name="Environment" instance=ExtResource("1_p4eel")] -[node name="Plane" parent="." index="0"] +[node name="Plane" parent="." index="1"] surface_material_override/0 = SubResource("StandardMaterial3D_if5ix") surface_material_override/1 = SubResource("StandardMaterial3D_jylvv") diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/world.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/world.gd index 8e4eb8d5..39b7f971 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/world.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/Shooter/world.gd @@ -30,7 +30,7 @@ func _on_join_button_pressed(): main_menu.hide() hud.show() - var address + var address = address_entry.text if address_entry.text == "": address = "localhost" diff --git a/prototypes/game-burghardt-goergens-ragerumble-minigames/mainmenu.gd b/prototypes/game-burghardt-goergens-ragerumble-minigames/mainmenu.gd index 6d574dac..1bcc936d 100644 --- a/prototypes/game-burghardt-goergens-ragerumble-minigames/mainmenu.gd +++ b/prototypes/game-burghardt-goergens-ragerumble-minigames/mainmenu.gd @@ -19,5 +19,5 @@ func _on_shooter_button_down(): print ("Error changing to Shooter!") func _on_scream_jump_button_down(): - if get_tree().change_scene_to_file("res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/menu.tscn") != OK: + if get_tree().change_scene_to_file("res://prototypes/game-burghardt-goergens-ragerumble-minigames/Jumper/game-test.tscn") != OK: print ("Error changing to Jumper!")