diff --git a/.gitignore b/.gitignore index 7b6bf55..25adc3b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ data_*/ *.log test/ build/* -builds/* \ No newline at end of file +builds/* +*.zip \ No newline at end of file diff --git a/Game/source/assets/scripts/player_handlers/player_body_handler.gd b/Game/source/assets/scripts/player_handlers/player_body_handler.gd index 2eeb25b..196636c 100644 --- a/Game/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/Game/source/assets/scripts/player_handlers/player_body_handler.gd @@ -140,7 +140,7 @@ func _physics_process(delta) -> void: if "0" in VDIR: if VDIR["1"]["0"]["ray"]["length"] - dimensions["collider"]["radius"] > 2 and jumpState == false: gravityVector = (VDIR["1"]["0"]["ray"]["position"] - user_state["global_position"]).normalized() - print("Gravity on") + #print("Gravity on") elif jumpState == false: gravityVector = Vector2(0,0) movementVector = Vector2(0,0) diff --git a/Game/source/assets/scripts/ui_element_handlers/winner.gd b/Game/source/assets/scripts/ui_element_handlers/winner.gd index ddf9da1..8470d75 100644 --- a/Game/source/assets/scripts/ui_element_handlers/winner.gd +++ b/Game/source/assets/scripts/ui_element_handlers/winner.gd @@ -4,6 +4,6 @@ sync func return_to_lobby(): get_tree().change_scene("res://source/scenes/GUI/main_menu.tscn") -#func _on_win_timer_timeout(): -# if get_tree().is_network_server(): -# rpc("return_to_lobby") +func _on_win_timer_timeout(): + if get_tree().is_network_server(): + rpc("return_to_lobby") diff --git a/Game/source/levels/trinity_site/trinity_site_level.tscn b/Game/source/levels/trinity_site/trinity_site_level.tscn index 1f82b76..083eb4e 100644 --- a/Game/source/levels/trinity_site/trinity_site_level.tscn +++ b/Game/source/levels/trinity_site/trinity_site_level.tscn @@ -128,7 +128,6 @@ script = ExtResource( 2 ) script = ExtResource( 6 ) [node name="Control" type="Control" parent="game_UI"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 __meta__ = { @@ -156,6 +155,6 @@ __meta__ = { } [node name="win_timer" type="Timer" parent="game_UI/Control/winner"] -wait_time = 2.0 +wait_time = 4.0 [connection signal="timeout" from="game_UI/Control/winner/win_timer" to="game_UI/Control/winner" method="_on_win_timer_timeout"]