From 03be29fadd4166a811d4c10c751f5978988210c9 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 7 Mar 2024 18:29:09 -0700 Subject: [PATCH] fix menu backgrounds --- levels/ui/credits.tscn | 18 ++++++------------ levels/ui/debug.tscn | 18 ++++++------------ levels/ui/gamepadtest.tscn | 19 ++++++------------- levels/ui/musictest.tscn | 18 ++++++------------ levels/ui/scene.tscn | 20 +++++++------------- levels/ui/sfxtest.tscn | 18 ++++++------------ levels/ui/soundtest.tscn | 18 ++++++------------ levels/ui/testrooms.tscn | 18 ++++++------------ levels/ui/tmenu.gd | 4 +++- levels/ui/tmenu.tscn | 18 ++++++------------ 10 files changed, 58 insertions(+), 111 deletions(-) diff --git a/levels/ui/credits.tscn b/levels/ui/credits.tscn index b8aa103..06fe88f 100644 --- a/levels/ui/credits.tscn +++ b/levels/ui/credits.tscn @@ -1,21 +1,17 @@ -[gd_scene load_steps=6 format=3 uid="uid://g8ajwoud48us"] +[gd_scene load_steps=5 format=3 uid="uid://g8ajwoud48us"] [ext_resource type="Script" path="res://levels/ui/credits.gd" id="1_y6orl"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_0cref"] -[ext_resource type="Script" path="res://nebula.gd" id="3_ffw0g"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_6fe31"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="5_yvope"] [ext_resource type="Script" path="res://levels/ui/roll.gd" id="6_3q8sp"] [node name="credits" type="Node2D"] script = ExtResource("1_y6orl") -[node name="nebula" type="VideoStreamPlayer" parent="."] -offset_right = 40.0 -offset_bottom = 40.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_0cref") -autoplay = true -script = ExtResource("3_ffw0g") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_6fe31") [node name="roll" type="Label" parent="."] offset_top = 720.0 @@ -587,5 +583,3 @@ horizontal_alignment = 1 script = ExtResource("6_3q8sp") [node name="Bottomhud" parent="." instance=ExtResource("5_yvope")] - -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] diff --git a/levels/ui/debug.tscn b/levels/ui/debug.tscn index 0e4a564..4672354 100644 --- a/levels/ui/debug.tscn +++ b/levels/ui/debug.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://brrta1s63r2q2"] +[gd_scene load_steps=7 format=3 uid="uid://brrta1s63r2q2"] [ext_resource type="Script" path="res://levels/ui/debug.gd" id="1_gm5qw"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_l51wy"] -[ext_resource type="Script" path="res://nebula.gd" id="3_0jyxj"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_1w2er"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_ogmre"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_821nm"] @@ -23,14 +22,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_gm5qw") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_l51wy") -autoplay = true -script = ExtResource("3_0jyxj") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_1w2er") [node name="Game name" type="Label" parent="."] layout_mode = 0 @@ -81,7 +76,6 @@ text = "Back" [node name="Bottomhud" parent="." instance=ExtResource("4_ogmre")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="VBoxContainer/Gamepad Test" to="." method="_on_gamepad_test_pressed"] [connection signal="pressed" from="VBoxContainer/Scene Selector2" to="." method="_on_scene_selector_pressed"] [connection signal="pressed" from="VBoxContainer/Sound Test" to="." method="_on_sound_test_pressed"] diff --git a/levels/ui/gamepadtest.tscn b/levels/ui/gamepadtest.tscn index fc938c4..72b1f12 100644 --- a/levels/ui/gamepadtest.tscn +++ b/levels/ui/gamepadtest.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://qun4scsrsp00"] +[gd_scene load_steps=4 format=3 uid="uid://qun4scsrsp00"] [ext_resource type="Script" path="res://levels/ui/gamepadtest.gd" id="1_w4qrm"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_i62na"] -[ext_resource type="Script" path="res://nebula.gd" id="3_5yjm5"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_kcf5a"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_88ejd"] [node name="Gamepadtest" type="Control"] @@ -14,14 +13,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_w4qrm") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_i62na") -autoplay = true -script = ExtResource("3_5yjm5") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_kcf5a") [node name="Label" type="Label" parent="."] layout_mode = 0 @@ -155,5 +150,3 @@ text = "B" [node name="Bottomhud" parent="." instance=ExtResource("4_88ejd")] layout_mode = 1 - -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] diff --git a/levels/ui/musictest.tscn b/levels/ui/musictest.tscn index b3dfaa9..a3eb6d1 100644 --- a/levels/ui/musictest.tscn +++ b/levels/ui/musictest.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://v2cnmd1atfw1"] +[gd_scene load_steps=7 format=3 uid="uid://v2cnmd1atfw1"] [ext_resource type="Script" path="res://levels/ui/musictest.gd" id="1_mulrj"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_hc5pw"] -[ext_resource type="Script" path="res://nebula.gd" id="3_4oqoj"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_jgdg2"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_a1ux8"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cprm3"] @@ -23,14 +22,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_mulrj") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_hc5pw") -autoplay = true -script = ExtResource("3_4oqoj") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_jgdg2") [node name="Label" type="Label" parent="."] layout_mode = 0 @@ -216,7 +211,6 @@ text = "Back" [node name="Bottomhud" parent="." instance=ExtResource("4_a1ux8")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Title Screen" to="." method="_on_title_screen_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Disclaimer, Settings, Stores" to="." method="_on_disclaimer_settings_stores_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Testrooms" to="." method="_on_testrooms_pressed"] diff --git a/levels/ui/scene.tscn b/levels/ui/scene.tscn index 4d53ad1..60cf0b6 100644 --- a/levels/ui/scene.tscn +++ b/levels/ui/scene.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=7 format=3 uid="uid://duyxejhnys1l4"] +[gd_scene load_steps=6 format=3 uid="uid://duyxejhnys1l4"] [ext_resource type="Script" path="res://levels/ui/scene.gd" id="1_hxcrn"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_nvftm"] -[ext_resource type="Script" path="res://nebula.gd" id="3_6sds4"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_jnmob"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_2y7h7"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6u0xs"] @@ -20,14 +19,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_hxcrn") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_nvftm") -autoplay = true -script = ExtResource("3_6sds4") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_jnmob") [node name="Game name" type="Label" parent="."] layout_mode = 0 @@ -55,7 +50,7 @@ grow_vertical = 0 layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") -text = "Disclaimer" +text = "Disclaimer (and return to title)" [node name="Testrooms" type="Button" parent="VBoxContainer"] layout_mode = 2 @@ -90,7 +85,6 @@ text = "Back" [node name="Bottomhud" parent="." instance=ExtResource("4_2y7h7")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="VBoxContainer/Disclaimer" to="." method="_on_disclaimer_pressed"] [connection signal="pressed" from="VBoxContainer/Testrooms" to="." method="_on_testrooms_pressed"] [connection signal="pressed" from="VBoxContainer/Results" to="." method="_on_results_pressed"] diff --git a/levels/ui/sfxtest.tscn b/levels/ui/sfxtest.tscn index 5fc1c0d..e0182c4 100644 --- a/levels/ui/sfxtest.tscn +++ b/levels/ui/sfxtest.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=7 format=3 uid="uid://cv2a37xetkkse"] +[gd_scene load_steps=6 format=3 uid="uid://cv2a37xetkkse"] [ext_resource type="Script" path="res://levels/ui/sfxtest.gd" id="1_l1lbb"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_c55jp"] -[ext_resource type="Script" path="res://nebula.gd" id="3_yeu3h"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_uuurj"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_xxv3m"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cprm3"] @@ -20,14 +19,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_l1lbb") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_c55jp") -autoplay = true -script = ExtResource("3_yeu3h") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_uuurj") [node name="Game name" type="Label" parent="."] layout_mode = 0 @@ -92,7 +87,6 @@ text = "Back" [node name="Bottomhud" parent="." instance=ExtResource("4_xxv3m")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Game Over" to="." method="_on_game_over_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Gauge Fill" to="." method="_on_gauge_fill_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Explosion" to="." method="_on_explosion_pressed"] diff --git a/levels/ui/soundtest.tscn b/levels/ui/soundtest.tscn index b10d3bf..b4916c9 100644 --- a/levels/ui/soundtest.tscn +++ b/levels/ui/soundtest.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://chg6qe1fijkh3"] +[gd_scene load_steps=7 format=3 uid="uid://chg6qe1fijkh3"] [ext_resource type="Script" path="res://levels/ui/soundtest.gd" id="1_3bg6p"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_abtft"] -[ext_resource type="Script" path="res://nebula.gd" id="3_c33nl"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_x41qm"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_2a53a"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_wtbgt"] @@ -23,14 +22,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_3bg6p") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_abtft") -autoplay = true -script = ExtResource("3_c33nl") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_x41qm") [node name="Game name" type="Label" parent="."] layout_mode = 0 @@ -75,7 +70,6 @@ text = "Back" [node name="Bottomhud" parent="." instance=ExtResource("4_2a53a")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="VBoxContainer/Music" to="." method="_on_music_pressed"] [connection signal="pressed" from="VBoxContainer/Sfx" to="." method="_on_sfx_pressed"] [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/ui/testrooms.tscn b/levels/ui/testrooms.tscn index 5bb70c2..d9adc9c 100644 --- a/levels/ui/testrooms.tscn +++ b/levels/ui/testrooms.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=7 format=3 uid="uid://b0pgk6d871bor"] +[gd_scene load_steps=6 format=3 uid="uid://b0pgk6d871bor"] [ext_resource type="Script" path="res://levels/ui/testrooms.gd" id="1_p5nnr"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_wyg0k"] -[ext_resource type="Script" path="res://nebula.gd" id="3_co5y6"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_vkpo3"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_jvl8w"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6u0xs"] @@ -20,14 +19,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_p5nnr") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_wyg0k") -autoplay = true -script = ExtResource("3_co5y6") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_vkpo3") [node name="Game name" type="Label" parent="."] layout_mode = 0 @@ -98,7 +93,6 @@ text = "Back" [node name="Bottomhud" parent="." instance=ExtResource("4_jvl8w")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="VBoxContainer/Testspawn" to="." method="_on_testspawn_pressed"] [connection signal="pressed" from="VBoxContainer/Lilytest" to="." method="_on_lilytest_pressed"] [connection signal="pressed" from="VBoxContainer/Dialogtest" to="." method="_on_dialogtest_pressed"] diff --git a/levels/ui/tmenu.gd b/levels/ui/tmenu.gd index 9763072..fa1b235 100644 --- a/levels/ui/tmenu.gd +++ b/levels/ui/tmenu.gd @@ -23,7 +23,9 @@ func _level(): #get_tree().root.remove_child(boot) #boot.queue_free() -#func _input(event): +func _input(event): + if Input.is_action_just_pressed("ui_cancel"): + get_tree().change_scene_to_file("res://title.tscn") # Mouse in viewport coordinates. # if Input.is_key_pressed(KEY_ENTER) || Input.is_joy_button_pressed(0,JOY_BUTTON_B): #print("Mouse Click/Unclick at: ", event.position) diff --git a/levels/ui/tmenu.tscn b/levels/ui/tmenu.tscn index a7fc913..e44c589 100644 --- a/levels/ui/tmenu.tscn +++ b/levels/ui/tmenu.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://s8ttuboef06k"] +[gd_scene load_steps=7 format=3 uid="uid://s8ttuboef06k"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="1_33b4o"] [ext_resource type="Script" path="res://levels/ui/tmenu.gd" id="1_w3aym"] -[ext_resource type="Script" path="res://nebula.gd" id="2_x35ws"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="2_sqp06"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_0qcfw"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_821nm"] @@ -23,14 +22,10 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_w3aym") -[node name="nebula" type="VideoStreamPlayer" parent="."] -layout_mode = 0 -offset_right = 640.0 -offset_bottom = 368.0 -scale = Vector2(2, 1.96) -stream = ExtResource("1_33b4o") -autoplay = true -script = ExtResource("2_x35ws") +[node name="Night Sky" type="TextureRect" parent="."] +offset_right = 1280.0 +offset_bottom = 720.0 +texture = ExtResource("2_sqp06") [node name="Game name" type="Label" parent="."] layout_mode = 0 @@ -75,7 +70,6 @@ text = "Exit" [node name="Bottomhud" parent="." instance=ExtResource("4_0qcfw")] layout_mode = 1 -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"] [connection signal="pressed" from="VBoxContainer/Debug" to="." method="_on_debug_pressed"] [connection signal="pressed" from="VBoxContainer/Exit" to="." method="_on_exit_pressed"]