summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.import/banner.png-7827040765b75a85fe17438eb00e188b.md53
-rw-r--r--.import/banner.png-7827040765b75a85fe17438eb00e188b.stexbin0 -> 5321 bytes
-rw-r--r--project.godot2
-rw-r--r--scenes/levels/base_level.gd2
-rw-r--r--textures/banner.png.import34
5 files changed, 40 insertions, 1 deletions
diff --git a/.import/banner.png-7827040765b75a85fe17438eb00e188b.md5 b/.import/banner.png-7827040765b75a85fe17438eb00e188b.md5
new file mode 100644
index 0000000..cb37f6e
--- /dev/null
+++ b/.import/banner.png-7827040765b75a85fe17438eb00e188b.md5
@@ -0,0 +1,3 @@
+source_md5="77056c935b351caaa4b06cae31a89258"
+dest_md5="bedfc938b65cb6b1be8c20a30f42196a"
+
diff --git a/.import/banner.png-7827040765b75a85fe17438eb00e188b.stex b/.import/banner.png-7827040765b75a85fe17438eb00e188b.stex
new file mode 100644
index 0000000..6dd1273
--- /dev/null
+++ b/.import/banner.png-7827040765b75a85fe17438eb00e188b.stex
Binary files differ
diff --git a/project.godot b/project.godot
index 80d51c1..7763712 100644
--- a/project.godot
+++ b/project.godot
@@ -69,6 +69,7 @@ Settings="*res://components/Settings.gd"
window/size/width=1280
window/size/height=720
+window/size/fullscreen=true
mouse_cursor/custom_image="res://textures/icons/cursor.png"
window/stretch/mode="2d"
window/stretch/aspect="keep"
@@ -113,3 +114,4 @@ vram_compression/import_etc=true
vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.00392157, 0.0862745, 0.160784, 1 )
environment/default_environment="res://default_env.tres"
+<<<<<<<Updatedupstreamenvironment/default_clear_color=Color( 0.00392157, 0.0862745, 0.160784, 1 )
diff --git a/scenes/levels/base_level.gd b/scenes/levels/base_level.gd
index f7d9cbe..5ae9ebe 100644
--- a/scenes/levels/base_level.gd
+++ b/scenes/levels/base_level.gd
@@ -50,7 +50,7 @@ func _on_Level_lost_heart():
func _load_next_level():
_unload_current_level()
_current_level += 1
- if _current_level > _levels.size():
+ if _current_level >= _levels.size():
get_tree().change_scene("res://scenes/menu.tscn")
return
_load_current_level()
diff --git a/textures/banner.png.import b/textures/banner.png.import
new file mode 100644
index 0000000..9b20e36
--- /dev/null
+++ b/textures/banner.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/banner.png-7827040765b75a85fe17438eb00e188b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/banner.png"
+dest_files=[ "res://.import/banner.png-7827040765b75a85fe17438eb00e188b.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
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0