Browse Source

Merge branch 'master' into feature-level-0

master
Luna 7 years ago
parent
commit
ea6b0b9567
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      scenes/player.tscn

+ 4
- 3
scenes/player.tscn View File

@ -20,7 +20,7 @@ radial_segments = 64
rings = 8 rings = 8
_sections_unfolded = [ "Resource" ] _sections_unfolded = [ "Resource" ]
[node name="RigidBody" type="RigidBody" groups=[
[node name="RigidBody" type="RigidBody" index="0" groups=[
"player", "player",
]] ]]
@ -79,9 +79,11 @@ _sections_unfolded = [ "Transform", "Visibility" ]
[node name="Pitch" type="Spatial" parent="Yaw" index="0"] [node name="Pitch" type="Spatial" parent="Yaw" index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0 )
_sections_unfolded = [ "Transform" ]
[node name="Camera" type="Camera" parent="Yaw/Pitch" index="0"] [node name="Camera" type="Camera" parent="Yaw/Pitch" index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0 )
keep_aspect = 0 keep_aspect = 0
cull_mask = 1048575 cull_mask = 1048575
environment = null environment = null
@ -98,7 +100,6 @@ _sections_unfolded = [ "Transform", "Visibility" ]
[node name="Ray" type="RayCast" parent="Yaw/Pitch" index="1"] [node name="Ray" type="RayCast" parent="Yaw/Pitch" index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0 )
enabled = true enabled = true
exclude_parent = true exclude_parent = true
cast_to = Vector3( 0, 0, -100 ) cast_to = Vector3( 0, 0, -100 )


Loading…
Cancel
Save