34 lines
927 B
Plaintext
34 lines
927 B
Plaintext
<<<<<<< HEAD
|
|
[gd_scene load_steps=2 format=3]
|
|
|
|
[ext_resource type="Script" path="res://scripts/player_spawner.gd" id="1"]
|
|
|
|
[node name="Player" type="CharacterBody3D"]
|
|
script = ExtResource("1")
|
|
=======
|
|
[gd_scene load_steps=3 format=3 uid="uid://player_scene_001"]
|
|
|
|
[ext_resource type="Script" path="res://scripts/player.gd" id="1_player"]
|
|
|
|
[sub_resource type="CapsuleMesh" id="CapsuleMesh1"]
|
|
radius = 0.35
|
|
height = 1.6
|
|
|
|
[sub_resource type="CapsuleShape3D" id="CapsuleShape1"]
|
|
radius = 0.35
|
|
height = 1.6
|
|
|
|
[node name="Player" type="CharacterBody3D"]
|
|
script = ExtResource("1_player")
|
|
|
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
|
shape = SubResource("CapsuleShape1")
|
|
|
|
[node name="CapsuleMesh" type="MeshInstance3D" parent="."]
|
|
mesh = SubResource("CapsuleMesh1")
|
|
|
|
[node name="Camera3D" type="Camera3D" parent="."]
|
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
|
|
current = true
|
|
>>>>>>> origin/main
|