Compare commits
No commits in common. "28385b6ee245987b806a0073a38e58bb0bd625d6" and "cc34a375d881429ffe0a2fc904279900a604880c" have entirely different histories.
28385b6ee2
...
cc34a375d8
|
|
@ -106,9 +106,10 @@ func _ready():
|
|||
ui_prober.area_exited.connect(_on_ray_exited)
|
||||
$CrouchDetector.area_exited.connect(exit_crouch)
|
||||
pitch.rotation_degrees.x = initial_pitch
|
||||
crouched = false
|
||||
|
||||
func _process(_delta):
|
||||
|
||||
if has_stage:
|
||||
if has_entered:
|
||||
if focus_ray.get_collider() == null:
|
||||
pass
|
||||
|
|
@ -156,7 +157,7 @@ func _on_ray_exited(area):
|
|||
|
||||
|
||||
func _physics_process(delta:float):
|
||||
if has_stage or true:
|
||||
if has_stage:
|
||||
_handle_movement(delta)
|
||||
_handle_rotation(delta)
|
||||
if jitter_strength > 0 and not State.reduce_motion: _handle_jitter(delta)
|
||||
|
|
@ -232,7 +233,7 @@ var cround_start_time: float = 0
|
|||
|
||||
func _input(event:InputEvent) -> void:
|
||||
if Scenes.current_sequence != -1: return
|
||||
if has_stage and Scenes.current_sequence == -1 or true:
|
||||
if has_stage and Scenes.current_sequence == -1:
|
||||
if event is InputEventMouseMotion and Input.mouse_mode == Input.MOUSE_MODE_CAPTURED:
|
||||
_handle_mouse_input(event)
|
||||
get_viewport().set_input_as_handled()
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@ enum id {
|
|||
ADULT_BURNOUT
|
||||
}
|
||||
|
||||
signal player_enable(enabled: bool);
|
||||
|
||||
signal scene_starting(scene_id: id, is_repeating: bool)
|
||||
signal scene_finished(scene_id: id, is_repeating: bool)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
[gd_scene load_steps=7 format=3 uid="uid://cjb4gu40l3jah"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://c281w7earok6w" path="res://base-environments/youth_room/crouch_volume.gd" id="1_ki2be"]
|
||||
[ext_resource type="PackedScene" uid="uid://mkccbig41bqb" path="res://logic-scenes/player_controller/player_controller.tscn" id="2_rmwd0"]
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ki2be"]
|
||||
radius = 1.14469
|
||||
height = 3.78697
|
||||
|
||||
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_ki2be"]
|
||||
|
||||
[sub_resource type="PlaneMesh" id="PlaneMesh_ki2be"]
|
||||
size = Vector2(50, 50)
|
||||
|
||||
[sub_resource type="SphereMesh" id="SphereMesh_ki2be"]
|
||||
radius = 5.0
|
||||
height = 10.0
|
||||
|
||||
[node name="CharacterTests" type="Node3D"]
|
||||
|
||||
[node name="bed_crouch" type="Area3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.24356, 0, -0.796765)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
script = ExtResource("1_ki2be")
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="bed_crouch"]
|
||||
transform = Transform3D(0.995341, 0.096419, 0, 4.21461e-09, -4.35077e-08, -1, -0.096419, 0.995341, -4.37114e-08, 0.107988, 1.56575e-08, -0.358201)
|
||||
shape = SubResource("CapsuleShape3D_ki2be")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="bed_crouch"]
|
||||
|
||||
[node name="Label3D" type="Label3D" parent="bed_crouch"]
|
||||
transform = Transform3D(1, 0, 0, 0, 0.27838773, 0.96046877, 0, -0.96046877, 0.27838773, 0, 0.29873586, 0)
|
||||
text = "CROUCH VOLUME"
|
||||
|
||||
[node name="PlayerController" parent="." groups=["camera_owner"] instance=ExtResource("2_rmwd0")]
|
||||
unique_name_in_owner = true
|
||||
process_mode = 4
|
||||
transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925)
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="CollisionShape3D"]
|
||||
shape = SubResource("WorldBoundaryShape3D_ki2be")
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0049040318, -0.008946419, 0.003689289)
|
||||
mesh = SubResource("PlaneMesh_ki2be")
|
||||
|
||||
[node name="OmniLight3D" type="OmniLight3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.221635, 0)
|
||||
|
||||
[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5455923, 4.7683716e-07, -5.57273)
|
||||
mesh = SubResource("SphereMesh_ki2be")
|
||||
Loading…
Reference in New Issue