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

Fixing merge conflicts

Browse Source
This commit is contained in:
Jasmine Hyder
2021-12-09 20:52:13 -06:00
parent 9d8de425bb 8bd4acb6fe
commit 1fd6eeac95
100 changed files with 2347 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Sprites/Levels/Environment/fire_column_medium_10.png → Sprites/Levels/Environment/Fire_Column_Medium_10.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 265 B

6
Sprites/Levels/Environment/fire_column_medium_10.png.import → Sprites/Levels/Environment/Fire_Column_Medium_10.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex"
path="res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/fire_column_medium_10.png"
dest_files=[ "res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex" ]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png"
dest_files=[ "res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex" ]
[params]

0
Sprites/Levels/Environment/fire_column_medium_11.png → Sprites/Levels/Environment/Fire_Column_Medium_11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 B

After

Width:  |  Height:  |  Size: 208 B

6
Sprites/Levels/Environment/fire_column_medium_11.png.import → Sprites/Levels/Environment/Fire_Column_Medium_11.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/fire_column_medium_11.png-f6c2ac8f20428aebca0febd0f65a5806.stex"
path="res://.import/Fire_Column_Medium_11.png-cb278dde504fd6f8f415eda7091cfa9a.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/fire_column_medium_11.png"
dest_files=[ "res://.import/fire_column_medium_11.png-f6c2ac8f20428aebca0febd0f65a5806.stex" ]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_11.png"
dest_files=[ "res://.import/Fire_Column_Medium_11.png-cb278dde504fd6f8f415eda7091cfa9a.stex" ]
[params]

0
Sprites/Levels/Environment/fire_column_medium_12.png → Sprites/Levels/Environment/Fire_Column_Medium_12.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 181 B

6
Sprites/Levels/Environment/fire_column_medium_12.png.import → Sprites/Levels/Environment/Fire_Column_Medium_12.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/fire_column_medium_12.png-25bc0d063fd42a44b6e9e423e3bf2656.stex"
path="res://.import/Fire_Column_Medium_12.png-1e7c2da6903b243f73d7ed4b50d90f8a.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/fire_column_medium_12.png"
dest_files=[ "res://.import/fire_column_medium_12.png-25bc0d063fd42a44b6e9e423e3bf2656.stex" ]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_12.png"
dest_files=[ "res://.import/Fire_Column_Medium_12.png-1e7c2da6903b243f73d7ed4b50d90f8a.stex" ]
[params]

0
Sprites/Levels/Environment/fire_column_medium_13.png → Sprites/Levels/Environment/Fire_Column_Medium_13.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 B

After

Width:  |  Height:  |  Size: 151 B

6
Sprites/Levels/Environment/fire_column_medium_13.png.import → Sprites/Levels/Environment/Fire_Column_Medium_13.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/fire_column_medium_13.png-6f8490642f9a7a3884a31ae3975deb08.stex"
path="res://.import/Fire_Column_Medium_13.png-a147b7694df1cdf05d373697c6a4ede3.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/fire_column_medium_13.png"
dest_files=[ "res://.import/fire_column_medium_13.png-6f8490642f9a7a3884a31ae3975deb08.stex" ]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_13.png"
dest_files=[ "res://.import/Fire_Column_Medium_13.png-a147b7694df1cdf05d373697c6a4ede3.stex" ]
[params]

0
Sprites/Levels/Environment/fire_column_medium_14.png → Sprites/Levels/Environment/Fire_Column_Medium_14.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 125 B

6
Sprites/Levels/Environment/fire_column_medium_14.png.import → Sprites/Levels/Environment/Fire_Column_Medium_14.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/fire_column_medium_14.png-81452b14764f0dd97e4008c5f9448c38.stex"
path="res://.import/Fire_Column_Medium_14.png-205dacf8251c335e3becb65b0df84941.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/fire_column_medium_14.png"
dest_files=[ "res://.import/fire_column_medium_14.png-81452b14764f0dd97e4008c5f9448c38.stex" ]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_14.png"
dest_files=[ "res://.import/Fire_Column_Medium_14.png-205dacf8251c335e3becb65b0df84941.stex" ]
[params]