diff --git a/client/scenes/entities/player/player.gd b/client/scenes/entities/player/player.gd index a20dd7bff2c2d569e31692e9def6de858f3cc716..9421270a6b841e72aeacee261152d2b8b9d8603b 100644 --- a/client/scenes/entities/player/player.gd +++ b/client/scenes/entities/player/player.gd @@ -25,4 +25,4 @@ func _ready(): player = $KinematicBody remote func getRemoteMovement(position): - player.move_and_slide(position, Vector3(0,1,0), 0.05, 4, deg2rad(MAX_SLOPE_ANGLE)) \ No newline at end of file + player.move_and_slide(position, Vector3(0,1,0), 0.05, 1, deg2rad(MAX_SLOPE_ANGLE)) \ No newline at end of file diff --git a/client/scenes/entities/player/player.tscn b/client/scenes/entities/player/player.tscn index 64a60bb08db60e75b66102bd7b2424db69e9cd3a..f8b4b8eff2a06e9d7fa82a45caf4ff0d86f8626c 100644 --- a/client/scenes/entities/player/player.tscn +++ b/client/scenes/entities/player/player.tscn @@ -16,12 +16,10 @@ script = ExtResource( 1 ) [node name="Body_CollisionShape" type="CollisionShape" parent="KinematicBody"] transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.585563, 0 ) shape = SubResource( 1 ) -disabled = true [node name="Feet_CollisionShape" type="CollisionShape" parent="KinematicBody"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.131137, 0 ) shape = SubResource( 2 ) -disabled = true [node name="Model" type="Spatial" parent="KinematicBody"] diff --git a/server/scenes/autoloads/gamestate.gd b/server/scenes/autoloads/gamestate.gd index 6716d8374f0471668af28837449e53cda2372812..3259d47eebbced73f7670a1c913c4e34b6b6bdca 100644 --- a/server/scenes/autoloads/gamestate.gd +++ b/server/scenes/autoloads/gamestate.gd @@ -3,7 +3,7 @@ extends Node const GAMEPATH = "/root/game" const PORT = 10001 -const MAX_CLIENTS = 1 +const MAX_CLIENTS = 2 var players = {} diff --git a/server/scenes/entities/player/player.gd b/server/scenes/entities/player/player.gd index ad7fba662cd0f6f7a81ede85b2ebc3725b0c5ec1..f3bb8f5a166897d75b52caa5948f81aa32d73386 100644 --- a/server/scenes/entities/player/player.gd +++ b/server/scenes/entities/player/player.gd @@ -14,6 +14,7 @@ const MAX_SPRINT_SPEED:float = 12.0 var isSprinting:bool = false const JUMP_SPEED:float = 16.0 +var isJumping:bool = false # TODO: unreal, try to understand that, genius const GRAVITY:float = -28.0 @@ -40,6 +41,7 @@ func getPlayerInputs(movementInput, sprintInput, jumpInput): motion.z = 0 isSprinting = sprintInput + isJumping = jumpInput if player.is_on_floor()||player.is_on_wall(): if jumpInput: