Merge branch 'stable2'

This commit is contained in:
Spencer Killen 2023-08-19 17:16:06 -06:00
commit 2f9d1df923
Signed by: sjkillen
GPG Key ID: F307025B65C860BA
2 changed files with 17 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -4,6 +4,8 @@
[ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="2_hg0av"] [ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="2_hg0av"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"]
radius = 0.06
height = 0.43
[node name="Player" type="CharacterBody3D"] [node name="Player" type="CharacterBody3D"]
script = ExtResource("1_7gpdp") script = ExtResource("1_7gpdp")