daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts when trying to merge main into forest

Browse Source
This commit is contained in:
Jasmine Hyder
2021-12-08 14:43:39 -06:00
parent 1a8ef7ff92 d6e7dd9db3
commit 6d9267d23b
131 changed files with 3271 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Levels/Objects/Door.tscn
View File

@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Sprites/Assets/DoorOpen.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Assets/DoorClosed.png" type="Texture" id=2]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Closed.png" type="Texture" id=2]
[node name="Door" type="Sprite"]
@@ -10,4 +11,4 @@ texture = ExtResource( 2 )
[node name="doorOpened" type="Sprite" parent="."]
visible = false
texture = ExtResource( 1 )
texture = ExtResource( 1 )