Merge branch 'develop'

# Conflicts:
#	godot/Main.tscn
#	godot/levels/Level2.tmx
#	godot/levels/Level2.tmx.import
This commit is contained in:
Chris Cromer 2022-04-20 10:31:21 -04:00
commit 3e63355826
Signed by: cromer
GPG Key ID: FA91071797BEEEC2
31 changed files with 538 additions and 5 deletions

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://Main.gdns" type="Script" id=1] [ext_resource path="res://Main.gdns" type="Script" id=1]
[ext_resource path="res://levels/Prototype.tscn" type="PackedScene" id=2] [ext_resource path="res://levels/Level2.tscn" type="PackedScene" id=2]
[node name="Main" type="Node"] [node name="Main" type="Node"]
script = ExtResource( 1 ) script = ExtResource( 1 )

BIN
godot/assets/blocks/blocks-coin.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/blocks-coin.png-e02d021b2492bebc2d42f6607de594d0.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/blocks/blocks-coin.png"
dest_files=[ "res://.import/blocks-coin.png-e02d021b2492bebc2d42f6607de594d0.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

BIN
godot/assets/blocks/blocks-exclamation.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/blocks-exclamation.png-3d4ad82f7288be44d67e956f3c0bebbc.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/blocks/blocks-exclamation.png"
dest_files=[ "res://.import/blocks-exclamation.png-3d4ad82f7288be44d67e956f3c0bebbc.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

BIN
godot/assets/blocks/blocks-lock.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/blocks-lock.png-e62b69c90efbafbcd301ed5c5a597fa0.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/blocks/blocks-lock.png"
dest_files=[ "res://.import/blocks-lock.png-e62b69c90efbafbcd301ed5c5a597fa0.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

BIN
godot/assets/blocks/blocks-normal.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/blocks-normal.png-4af7780b7fe056a41734dfa530cd81c4.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/blocks/blocks-normal.png"
dest_files=[ "res://.import/blocks-normal.png-4af7780b7fe056a41734dfa530cd81c4.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

BIN
godot/assets/button.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/button.png-c79155b6e84601a7c5a042250ad77b07.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/button.png"
dest_files=[ "res://.import/button.png-c79155b6e84601a7c5a042250ad77b07.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

BIN
godot/assets/coin.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/coin.png-f04b9cd408b88aba3ab0966b4da32df0.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/coin.png"
dest_files=[ "res://.import/coin.png-f04b9cd408b88aba3ab0966b4da32df0.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

BIN
godot/assets/flag.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/flag.png-29c6a06ab0a1d25cfcfa38ea2a7baffa.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/flag.png"
dest_files=[ "res://.import/flag.png-29c6a06ab0a1d25cfcfa38ea2a7baffa.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

BIN
godot/assets/gems/gem1.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/gem1.png-11065ad0e2eb5b112fc6a0edf260e97b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/gems/gem1.png"
dest_files=[ "res://.import/gem1.png-11065ad0e2eb5b112fc6a0edf260e97b.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

BIN
godot/assets/gems/gem2.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/gem2.png-72573c34c050e40128e078d94f847e09.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/gems/gem2.png"
dest_files=[ "res://.import/gem2.png-72573c34c050e40128e078d94f847e09.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

BIN
godot/assets/gems/gem3.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/gem3.png-471deee972b4e29e8d552e3b1ebf7645.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/gems/gem3.png"
dest_files=[ "res://.import/gem3.png-471deee972b4e29e8d552e3b1ebf7645.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

BIN
godot/assets/health.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/health.png-00457dc45e4c240f12819344f6504f87.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/health.png"
dest_files=[ "res://.import/health.png-00457dc45e4c240f12819344f6504f87.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

BIN
godot/assets/key.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/key.png-a97df9ba773df86f934812b8b28ef996.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/key.png"
dest_files=[ "res://.import/key.png-a97df9ba773df86f934812b8b28ef996.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

BIN
godot/assets/spring.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/spring.png-3b3902b04c9197ab9097abc899b361d1.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/spring.png"
dest_files=[ "res://.import/spring.png-3b3902b04c9197ab9097abc899b361d1.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

BIN
godot/assets/switch.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/switch.png-7f9d21c701660c7107ee136e6649068b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/switch.png"
dest_files=[ "res://.import/switch.png-7f9d21c701660c7107ee136e6649068b.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

View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="141" height="32" tilewidth="18" tileheight="18" infinite="0" nextlayerid="10" nextobjectid="2"> <map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="141" height="32" tilewidth="18" tileheight="18" infinite="0" nextlayerid="11" nextobjectid="3">
<tileset firstgid="1" source="../tilesets/tiles.tsx"/> <tileset firstgid="1" source="../tilesets/tiles.tsx"/>
<layer id="5" name="MiddleBackground" width="141" height="32"> <layer id="5" name="MiddleBackground" width="141" height="32">
<data encoding="base64" compression="zstd"> <data encoding="base64" compression="zstd">
KLUv/WCARXUAABgAdQACAH8FesSH8I4N KLUv/WCARR0BAFgAmgAAAJucAJp1AAYAfwV6TDiADwQeyP/9j6vwLlFiVMcG
</data> </data>
</layer> </layer>
<layer id="3" name="Background" width="141" height="32"> <layer id="3" name="Background" width="141" height="32">
<data encoding="base64" compression="zstd"> <data encoding="base64" compression="zstd">
KLUv/WCAReUHAMJFERyAa1oDcI3yNgxLrJADMYGMt1VK3WqlViu1WtMUj4khBhdcZJCFAKFxxnPnTUDFDzcs6dEhpRLMlytV2+7O8VvXySWPBFSgUI9lOjCDESmJ0wEFUDBH6aMKnaYbqE3TeZHUEB8pcQNNOxDfKqik4dIamYl9N6jbSwMvVRqDzrlB7c8GUWKOC6sUzQEVzzPO4IgxtKAog6tu1FTgDVN/nN++tBeZA0EN5xk1db0sksKmrmbykTr0A63DDawOgUagB0qpvyBVq4CeYFVHe3t5wv3BM1Ta3X7RbDSyulEpRUiNZjBlQK7pDf62ajznrSAe+evSQvunzakrBQ== KLUv/WCARdUIAGJGEhyATVoDd0XtKOuQYW4wgYL5HVaKLAO0Ls3IT58UmMKKML5IuTIdigbihxssrwQOeDRxcsgfivDBBSlJoD93Jpbd3eXXVHXzdk1goGBvZTowgxEpidMBBVAwR+2jCpWmG6hNU3mRzDAfqbiBpjuQbxVUUnF5jayJvhtU7aWHlyqNQeXcoMZPClJijgsWFJ0Dap1nnMeRMbRK0QFWye5GSAXeMNWO892X9CIzEFR4nlFTV8sgKWzq6kwGUod+oHe4gdUh0Ah0oCT1F6R6FdAJVuXoai9PuD94hkq72i/ijUZWNyolCKnRDKYRuQz8JXCq7wY1zekAnrN0iMRSqpA2pyoc1rT5RlVbVb7zVjAe+XVpoe+HzKkrBQ==
</data> </data>
</layer> </layer>
<layer id="1" name="Middleground" width="141" height="32"> <layer id="1" name="Middleground" width="141" height="32">
<data encoding="base64" compression="zstd"> <data encoding="base64" compression="zstd">
KLUv/WCARRUIANIEDhigRa0BQ/Q7R/1PsR/MPm2z0rW2E5CaSAF3bMIsV1J77ry5tED4oDjxQam7jR15GE8B0aFV8PXATaBgbbV0gAIUiIjIcQ60HM0oqqweBdaQKlwM1t8qpJZ8tB1EMyqotCNCvamRnuRifF+MubDcIJ1XDxT2Dk2sGSCCbmjVF90Y3KEoKuyI0JoBkXSjVCsddwC1S4ocQUr6N/Q3mAJ9d6or3KrVk3AMw9j/AKvg1Qj5Vxzki1QZxqrbTl1K3FCJ/5Lc4JzPwKsSN+cBgD8c4+5imZRt4gscA6U5ZtMLqm/ED7qsETDJqarCYgqXJ/PkyFVHIrHjagYEG3EVjOLjEQ== KLUv/WCARWUIAOJEDhiQR60Bj+u7rOyvi/GpHuO2zbgyWjtZC1N3jFmuoPbceTOlQw+GF4wXJ5S629iTyHFUEDhgJXx9MFKgUG+1dJACFIiIiHEOtBTNcAqsPBJYIwoYNNffKuSWfLQdjGYMcGlHhPKmRr4sj20jH4aOcLlBqrcHHu4djKwzRgTdiKrX3RfYoUi0sGOCnRFi0g1UrRTuBW6XFEFClBhXWOAEQXU6FW5UtZsIfXeqFVyF1ZNQDMPYvwCr4NWI+FcI1kVaGcaqm04datxSw91kbnjmc+BUgYtzAKAf7njdL1Nli/gy96w032x64eqF+IGVNYInOW+lsDBli1NbMjI1iCR2pJ4BMUdUhVH8pQM=
</data> </data>
</layer> </layer>
<layer id="4" name="MiddleForeground" width="141" height="32"> <layer id="4" name="MiddleForeground" width="141" height="32">

View File

@ -16,6 +16,7 @@ tile_metadata=false
uv_clip=true uv_clip=true
image_flags=7 image_flags=7
collision_layer=2 collision_layer=2
collision_mask=0
embed_internal_images=false embed_internal_images=false
save_tiled_properties=false save_tiled_properties=false
add_background=true add_background=true