From b996560f5bc4165447179df3f5196addbd487c59 Mon Sep 17 00:00:00 2001 From: Jonas Bernard Date: Mon, 26 Apr 2021 18:15:08 +0200 Subject: dunno --- ...ceship.png-0219ecc9cc4831c0a066df8a8ab57c41.md5 | 3 ++ ...eship.png-0219ecc9cc4831c0a066df8a8ab57c41.stex | Bin 0 -> 426 bytes scenes/levels/base_level.gd | 2 +- scenes/levels/base_level.tscn | 1 - scenes/levels/reactiontest.tscn | 8 ++++- textures/icons/spaceship.png | Bin 0 -> 6472 bytes textures/icons/spaceship.png.import | 34 +++++++++++++++++++++ textures/icons/spaceship.xcf | Bin 0 -> 3208 bytes 8 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 .import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.md5 create mode 100644 .import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.stex create mode 100644 textures/icons/spaceship.png create mode 100644 textures/icons/spaceship.png.import create mode 100644 textures/icons/spaceship.xcf diff --git a/.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.md5 b/.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.md5 new file mode 100644 index 0000000..f2e7c83 --- /dev/null +++ b/.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.md5 @@ -0,0 +1,3 @@ +source_md5="e92c3357a94b1b7aeae4448b7685e684" +dest_md5="e25aa4fb84c747bbb1b6873ca21e15f4" + diff --git a/.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.stex b/.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.stex new file mode 100644 index 0000000..ef74187 Binary files /dev/null and b/.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.stex differ diff --git a/scenes/levels/base_level.gd b/scenes/levels/base_level.gd index b374705..66085c5 100644 --- a/scenes/levels/base_level.gd +++ b/scenes/levels/base_level.gd @@ -67,7 +67,7 @@ func _unload_current_level(): yield(get_tree(), "idle_frame") # todo animation here? post mortem func _delayed_delete(c): - yield(get_tree().create_timer(2.0), "timeout") + yield(get_tree().create_timer(10.0), "timeout") c.queue_free() func _load_current_level(): if _loaded_level != null: diff --git a/scenes/levels/base_level.tscn b/scenes/levels/base_level.tscn index e2d57ba..6681a7d 100644 --- a/scenes/levels/base_level.tscn +++ b/scenes/levels/base_level.tscn @@ -41,7 +41,6 @@ position = Vector2( 571.642, -311.599 ) text = "Menu" [node name="PauseMenu" parent="Camera2D" instance=ExtResource( 5 )] - [connection signal="done" from="Camera2D" to="." method="_on_Camera2D_done"] [connection signal="on_click" from="Camera2D/MenuButton" to="." method="_on_MenuButton_on_click"] [connection signal="unpause" from="Camera2D/PauseMenu" to="." method="_on_PauseMenu_unpause"] diff --git a/scenes/levels/reactiontest.tscn b/scenes/levels/reactiontest.tscn index 41031e3..fc85dbc 100644 --- a/scenes/levels/reactiontest.tscn +++ b/scenes/levels/reactiontest.tscn @@ -1,13 +1,19 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://scenes/levels/reactiontest.gd" type="Script" id=1] [ext_resource path="res://components/button.tscn" type="PackedScene" id=2] [ext_resource path="res://fonts/Flipps_Theme.tres" type="Theme" id=3] +[ext_resource path="res://textures/colors/light_blue.png" type="Texture" id=4] [node name="Level2" type="Node2D"] position = Vector2( 640, 320 ) script = ExtResource( 1 ) +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( -54.0326, 16.9514 ) +scale = Vector2( 931.209, 615.489 ) +texture = ExtResource( 4 ) + [node name="ButtonHolder" type="Node2D" parent="."] [node name="Button" parent="ButtonHolder" instance=ExtResource( 2 )] diff --git a/textures/icons/spaceship.png b/textures/icons/spaceship.png new file mode 100644 index 0000000..52b99e1 Binary files /dev/null and b/textures/icons/spaceship.png differ diff --git a/textures/icons/spaceship.png.import b/textures/icons/spaceship.png.import new file mode 100644 index 0000000..1d6e00f --- /dev/null +++ b/textures/icons/spaceship.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://textures/icons/spaceship.png" +dest_files=[ "res://.import/spaceship.png-0219ecc9cc4831c0a066df8a8ab57c41.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 diff --git a/textures/icons/spaceship.xcf b/textures/icons/spaceship.xcf new file mode 100644 index 0000000..c68f04b Binary files /dev/null and b/textures/icons/spaceship.xcf differ -- cgit