From 0c38e87bb10fa874a75d0766e8fd342d1fca29d1 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 2 Nov 2021 16:20:54 +0200 Subject: [PATCH] Deleted rotation sync --- kristofers/game/code/player.gd | 3 +-- kristofers/game/code/server/server_listener.gd | 1 - kristofers/game/code/simple_prompt.gd | 1 - kristofers/game/scenes/server_display.tscn | 3 +++ kristofers/movementSystem0.0.3/code/player.gd | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kristofers/game/code/player.gd b/kristofers/game/code/player.gd index d3ee9a7..585bfd5 100644 --- a/kristofers/game/code/player.gd +++ b/kristofers/game/code/player.gd @@ -36,7 +36,7 @@ func _physics_process(delta): if get_tree().has_network_peer(): if is_network_master(): mode_switch(delta) - screen_wrap() + screen_wrap() func mode_switch(delta): @@ -122,7 +122,6 @@ func _on_network_tick_rate_timeout(): if is_network_master(): rset_unreliable("puppet_position", global_position) rset_unreliable("puppet_velocity", velocity) - rset_unreliable("puppet_rotation", rotation_degrees) sync func update_position(pos): diff --git a/kristofers/game/code/server/server_listener.gd b/kristofers/game/code/server/server_listener.gd index 09b67cb..a1ecccf 100644 --- a/kristofers/game/code/server/server_listener.gd +++ b/kristofers/game/code/server/server_listener.gd @@ -1,6 +1,5 @@ extends Node - signal new_server signal remove_server diff --git a/kristofers/game/code/simple_prompt.gd b/kristofers/game/code/simple_prompt.gd index b1e9d1b..415a090 100644 --- a/kristofers/game/code/simple_prompt.gd +++ b/kristofers/game/code/simple_prompt.gd @@ -3,7 +3,6 @@ extends Control func _on_ok_pressed(): get_tree().change_scene("res://scenes/main_menu.tscn") - func set_text(text) -> void: diff --git a/kristofers/game/scenes/server_display.tscn b/kristofers/game/scenes/server_display.tscn index e27a169..a5e8a23 100644 --- a/kristofers/game/scenes/server_display.tscn +++ b/kristofers/game/scenes/server_display.tscn @@ -28,5 +28,8 @@ margin_top = 13.0 margin_bottom = -13.0 custom_fonts/font = ExtResource( 1 ) text = "Join" +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="pressed" from="join_button" to="." method="_on_join_button_pressed"] diff --git a/kristofers/movementSystem0.0.3/code/player.gd b/kristofers/movementSystem0.0.3/code/player.gd index c3d3002..84c053e 100644 --- a/kristofers/movementSystem0.0.3/code/player.gd +++ b/kristofers/movementSystem0.0.3/code/player.gd @@ -55,10 +55,10 @@ func movement(delta): if Input.is_action_just_pressed("stop"): velocity.x = 0 velocity.y = 0 - if Input.is_action_pressed("move_left"): + if Input.is_action_pressed("inpt_left"): if velocity.x > -MAX_SPEED: velocity.x -= speed - elif Input.is_action_pressed("move_right"): + elif Input.is_action_pressed("inpt_right"): if velocity.x < MAX_SPEED: velocity.x += speed @@ -74,13 +74,13 @@ func movement(delta): func flying(): var fly_speed = 1000 var velocity = Vector2() - if Input.is_action_pressed("move_right"): + if Input.is_action_pressed("inpt_right"): velocity.x += 1 - if Input.is_action_pressed("move_left"): + if Input.is_action_pressed("inpt_left"): velocity.x -= 1 - if Input.is_action_pressed("move_down"): + if Input.is_action_pressed("inpt_down"): velocity.y += 1 - if Input.is_action_pressed("move_up"): + if Input.is_action_pressed("inpt_up"): velocity.y -= 1 velocity = velocity.normalized() * fly_speed