added a basic inventory view on the player and a rotating stick to be seen in it

This commit is contained in:
Jenna Charleston 2021-09-03 16:57:14 -07:00
parent dd069f5616
commit 71dc4b693b
4 changed files with 14 additions and 10 deletions

View File

@ -1,3 +1,3 @@
source_md5="cbd7928cf85698fb7bdc5b438147e92e"
source_md5="5ad9e16429c8f214f03b62340c45d305"
dest_md5="01ae1686fb2b0f4f32561108eb869fae"

View File

@ -1,3 +1,3 @@
source_md5="b5d45fe4522233b64903d1245ce26f0d"
dest_md5="8269e603b23be064b5c152ebc50d9bfe"
source_md5="ea9d96a274f30b082d42c78895486cd5"
dest_md5="ec64f34761079cefddec592435684435"

View File

@ -1,16 +1,17 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Player/Player.gd" type="Script" id=1]
[ext_resource path="res://Menus/Inventory/Inventory.tscn" type="PackedScene" id=2]
[sub_resource type="CapsuleMesh" id=2]
[sub_resource type="CapsuleMesh" id=1]
mid_height = 4.0
radial_segments = 6
rings = 1
[sub_resource type="CapsuleShape" id=3]
[sub_resource type="CapsuleShape" id=2]
height = 4.0
[sub_resource type="CapsuleShape" id=4]
[sub_resource type="CapsuleShape" id=3]
radius = 1.1
height = 4.0
@ -22,18 +23,21 @@ script = ExtResource( 1 )
[node name="Camera" type="Camera" parent="Spatial"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -0.866904 )
cull_mask = 1048543
fov = 90.0
far = 250.0
[node name="Inventory" parent="Spatial/Camera" instance=ExtResource( 2 )]
[node name="MeshInstance" type="MeshInstance" parent="Spatial"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
visible = false
mesh = SubResource( 2 )
mesh = SubResource( 1 )
material/0 = null
[node name="CollisionShape" type="CollisionShape" parent="."]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
shape = SubResource( 3 )
shape = SubResource( 2 )
[node name="Timer" type="Timer" parent="."]
wait_time = 2.0
@ -45,7 +49,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="KillBox"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 3, 0 )
shape = SubResource( 4 )
shape = SubResource( 3 )
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
[connection signal="body_entered" from="KillBox" to="." method="_on_KillBox_body_entered"]