Merged with main and fixed merge conflicts

This commit is contained in:
VoidTwo
2021-11-29 13:22:17 -06:00
161 changed files with 2958 additions and 576 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Glowing_Ghost.png-46379ff53bc263370d2e0d62c670229c.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Enemies/Glowing_Ghost.png"
dest_files=[ "res://.import/Glowing_Ghost.png-46379ff53bc263370d2e0d62c670229c.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=0
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/blue_snowball.png-c6d5abfbfa9ce938493f1016f2e4589f.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Enemies/blue_snowball.png"
dest_files=[ "res://.import/blue_snowball.png-c6d5abfbfa9ce938493f1016f2e4589f.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/blue_snowman.png-112d9d688c299d472d979f859a987784.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Enemies/blue_snowman.png"
dest_files=[ "res://.import/blue_snowman.png-112d9d688c299d472d979f859a987784.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/pink_snowball.png-25092ec229f21e93ceffdfbf202a6897.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Enemies/pink_snowball.png"
dest_files=[ "res://.import/pink_snowball.png-25092ec229f21e93ceffdfbf202a6897.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/pink_snowman.png-d3376657eb23cfcae58851c482f8d18e.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Enemies/pink_snowman.png"
dest_files=[ "res://.import/pink_snowman.png-d3376657eb23cfcae58851c482f8d18e.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0