CommonParrot/Blobby
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: dependency fixes

Browse Source
This commit is contained in:
Jakob Feldmann 2023-06-12 18:31:41 +02:00
parent 788dc7b503
commit 23e30258b5
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn
View File

@ -64,7 +64,7 @@ margin_bottom = -20.0
margin_right = 200.0
margin_bottom = 48.0
text = "Begin Again"
next_scene_path = "res://src/UserInterface/Screens/MainScreen.tscn"
next_scene_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn"
[node name="QuitButton" parent="MenuContainer" instance=ExtResource( 5 )]
anchor_left = 0.0

2
src/UserInterface/Screens/InGameMenu/PauseScreen.tscn
View File

@ -67,7 +67,7 @@ margin_bottom = 165.0
focus_neighbour_top = NodePath("../RetryButton")
focus_neighbour_bottom = NodePath("../Continue")
text = "Main Menu"
next_scene_path = "res://src/UserInterface/Screens/MainScreen.tscn"
next_scene_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn"
[node name="PauseLabel" type="Label" parent="PauseOverlay"]
anchor_left = 0.5

2
src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd
View File

@ -1,6 +1,6 @@
extends Control
const InputLine = preload("res://src/UserInterface/Screens/ControlsMenu/InputLine.tscn")
const InputLine = preload("res://src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn")
var prev_line = null
func clear():

8
src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn
View File

@ -182,6 +182,8 @@ follow_focus = true
[node name="ActionKeyList" type="VBoxContainer" parent="KeymapViewer/ScrollContainer"]
unique_name_in_owner = true
margin_right = 552.0
margin_bottom = 177.0
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource( 14 )
@ -206,7 +208,7 @@ size_flags_horizontal = 0
size_flags_vertical = 0
text = "Back"
script = ExtResource( 2 )
next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn"
next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn"
[node name="Reset" type="Button" parent="."]
unique_name_in_owner = true
@ -359,7 +361,7 @@ size_flags_vertical = 4
text = "Save And Quit"
icon_align = 1
script = ExtResource( 4 )
next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn"
next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn"
[node name="ContinueEdit" type="Button" parent="ReallyQuitMenu/VBoxContainer"]
margin_top = 24.0
@ -390,7 +392,7 @@ size_flags_horizontal = 7
size_flags_vertical = 4
text = "Quit Don't Save"
script = ExtResource( 19 )
next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn"
next_screen_path = "res://src/UserInterface/Screens/MainMenu/MainScreen.tscn"
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 11 )

2
src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/InputLine.gd" type="Script" id=1]
[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/InputLine.gd" type="Script" id=1]
[node name="InputLine" type="HBoxContainer"]
anchor_top = 0.5

2
src/UserInterface/Screens/MainMenu/LevelList.gd
View File

@ -1,7 +1,7 @@
extends ScrollContainer
onready var LEVELS_PATH = "res://src/Levels/"
onready var BUTTON_GROUP : ButtonGroup = load("res://src/UserInterface/Screens/LevelSelectButtonGroup.tres")
onready var BUTTON_GROUP : ButtonGroup = load("res://src/UserInterface/Screens/MainMenu/LevelSelectButtonGroup.tres")
onready var vbox: VBoxContainer = $VBoxContainer
func _ready() -> void:

2
src/UserInterface/Screens/MainMenu/MainScreen.tscn
View File

@ -87,7 +87,7 @@ focus_neighbour_top = NodePath("../PlayButton")
focus_neighbour_bottom = NodePath("../QuitButton")
text = "Controls"
script = ExtResource( 12 )
next_screen_path = "res://src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn"
next_screen_path = "res://src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn"
[node name="QuitButton" parent="MenuContainer/Buttons" instance=ExtResource( 1 )]
unique_name_in_owner = true