NeonTea/gmtk24
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various menu related fixes

Browse Source
This commit is contained in:
Jens Pitkänen 2024-08-20 18:49:43 +03:00
parent 411a8fd1eb
commit 1d18668bf8
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scenes/interface/pause_menu.tscn
View File

@ -27,10 +27,10 @@ TableOrbitSpeedX = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsCont
TableOrbitSpeedY = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Building/Grid/TiltSpeedSlider") TableOrbitSpeedY = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Building/Grid/TiltSpeedSlider")
TableOrbitInvertX = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Building/Grid/InvertRotateCheck") TableOrbitInvertX = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Building/Grid/InvertRotateCheck")
TableOrbitInvertY = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Building/Grid/InvertTiltCheck") TableOrbitInvertY = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Building/Grid/InvertTiltCheck")
MsaaOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid/MsaaOptions") MsaaOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid/MsaaOptions")
RenderScaleOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid/RenderScaleOptions") RenderScaleOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid/RenderScaleOptions")
UpscalingOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid/UpscaleOptions") UpscalingOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid/UpscaleOptions")
WindowModeOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid/FullscreenOptions") WindowModeOptions = NodePath("CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid/FullscreenOptions")
[node name="CenterContainer" type="CenterContainer" parent="."] [node name="CenterContainer" type="CenterContainer" parent="."]
process_mode = 2 process_mode = 2
@ -220,20 +220,17 @@ theme_override_constants/margin_right = 10
theme_override_constants/margin_bottom = 10 theme_override_constants/margin_bottom = 10
metadata/_tab_index = 3 metadata/_tab_index = 3
[node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics"] [node name="Grid" type="GridContainer" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics"]
layout_mode = 2
[node name="Grid" type="GridContainer" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer"]
layout_mode = 2 layout_mode = 2
theme_override_constants/h_separation = 14 theme_override_constants/h_separation = 14
theme_override_constants/v_separation = 9 theme_override_constants/v_separation = 9
columns = 2 columns = 2
[node name="FullscreenLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="FullscreenLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
text = "Display mode" text = "Display mode"
[node name="FullscreenOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="FullscreenOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
selected = 0 selected = 0
item_count = 3 item_count = 3
@ -243,11 +240,11 @@ popup/item_1/id = 1
popup/item_2/text = "Exclusive fullscreen" popup/item_2/text = "Exclusive fullscreen"
popup/item_2/id = 2 popup/item_2/id = 2
[node name="MsaaLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="MsaaLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
text = "MSAA" text = "MSAA"
[node name="MsaaOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="MsaaOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
selected = 2 selected = 2
item_count = 4 item_count = 4
@ -259,12 +256,12 @@ popup/item_2/id = 2
popup/item_3/text = "8 samples" popup/item_3/text = "8 samples"
popup/item_3/id = 3 popup/item_3/id = 3
[node name="RenderScaleLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="RenderScaleLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
text = "Render scale text = "Render scale
" "
[node name="RenderScaleOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="RenderScaleOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
selected = 3 selected = 3
item_count = 6 item_count = 6
@ -281,11 +278,11 @@ popup/item_4/id = 150
popup/item_5/text = "200%" popup/item_5/text = "200%"
popup/item_5/id = 200 popup/item_5/id = 200
[node name="UpscaleLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="UpscaleLabel" type="Label" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
text = "Upscaling" text = "Upscaling"
[node name="UpscaleOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/ScrollContainer/Grid"] [node name="UpscaleOptions" type="OptionButton" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons/TabContainer/Graphics/Grid"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
selected = 0 selected = 0
@ -299,7 +296,7 @@ popup/item_2/id = 2
[node name="QuitButton" type="Button" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons"] [node name="QuitButton" type="Button" parent="CenterContainer/HBoxContainer/OptionsAndButtonsContainer/MarginContainer/Options and buttons"]
layout_mode = 2 layout_mode = 2
focus_neighbor_bottom = NodePath("../ContinueButton") focus_neighbor_bottom = NodePath("../ContinueButton")
text = "Quit" text = "Back to main menu"
[node name="CreditsContainer" type="PanelContainer" parent="CenterContainer/HBoxContainer"] [node name="CreditsContainer" type="PanelContainer" parent="CenterContainer/HBoxContainer"]
custom_minimum_size = Vector2(300, 0) custom_minimum_size = Vector2(300, 0)

4
scenes/main_menu.tscn
View File

@ -48,7 +48,7 @@ grow_vertical = 2
alignment = 1 alignment = 1
[node name="BoxContainer2" type="BoxContainer" parent="Panel/HBoxContainer"] [node name="BoxContainer2" type="BoxContainer" parent="Panel/HBoxContainer"]
custom_minimum_size = Vector2(600, 600) custom_minimum_size = Vector2(300, 300)
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
vertical = true vertical = true
@ -68,7 +68,7 @@ text = "Tower"
metadata/_edit_lock_ = true metadata/_edit_lock_ = true
[node name="BoxContainer" type="BoxContainer" parent="Panel/HBoxContainer"] [node name="BoxContainer" type="BoxContainer" parent="Panel/HBoxContainer"]
custom_minimum_size = Vector2(600, 600) custom_minimum_size = Vector2(300, 300)
layout_mode = 2 layout_mode = 2
alignment = 1 alignment = 1
vertical = true vertical = true

4
scripts/PauseMenu.cs
View File

@ -113,7 +113,7 @@ namespace Gmtk24 {
} }
}; };
Open(); Close();
} }
public override void _Input(InputEvent @event) { public override void _Input(InputEvent @event) {
@ -144,7 +144,7 @@ namespace Gmtk24 {
} }
public void Quit() { public void Quit() {
GetTree().Quit(); SceneSwitcher.Singleton.SwitchToScene(SceneSwitcher.Scene.MainMenu);
} }
} }
} }

3
scripts/SceneSwitcher.cs
View File

@ -94,6 +94,7 @@ namespace Gmtk24 {
private void LoadNextScene() { private void LoadNextScene() {
if (NextScene == null) { if (NextScene == null) {
GD.PrintErr("LoadNextScene called but NextScene is null!");
return; return;
} }
@ -104,6 +105,8 @@ namespace Gmtk24 {
} }
AddChild(InstantiatedScene); AddChild(InstantiatedScene);
MoveChild(InstantiatedScene, 0); MoveChild(InstantiatedScene, 0);
GetTree().Paused = false;
} }
} }
} }