From 096cd173934dcc932b1d61ef8e080896fa7bcee8 Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Wed, 28 Dec 2022 23:17:44 -0700 Subject: [PATCH] pause screen fix pause screen pause overlay was unusable with mouse, changed pause mode to process to fix --- .../timelines/timeline-1667668097.json | 4 +- godot/screens/PauseScreen.tscn | 33 +++++++------- .../test_titlescreen.tscn | 44 +++++++------------ 3 files changed, 34 insertions(+), 47 deletions(-) diff --git a/godot/dialogic/timelines/timeline-1667668097.json b/godot/dialogic/timelines/timeline-1667668097.json index b786928..20b89be 100644 --- a/godot/dialogic/timelines/timeline-1667668097.json +++ b/godot/dialogic/timelines/timeline-1667668097.json @@ -53,7 +53,7 @@ "set_value": "true" }, { - "change_scene": "res://tests/test_player_locomotion.tscn", + "change_scene": "res://assets/meat_creek/side_tunnel_1.tscn", "event_id": "dialogic_041" }, { @@ -70,7 +70,7 @@ "value": "true" }, { - "change_scene": "res://tests/test_player_locomotion.tscn", + "change_scene": "res://assets/meat_creek/side_tunnel_1.tscn", "event_id": "dialogic_041" }, { diff --git a/godot/screens/PauseScreen.tscn b/godot/screens/PauseScreen.tscn index d190c86..b347aa4 100644 --- a/godot/screens/PauseScreen.tscn +++ b/godot/screens/PauseScreen.tscn @@ -19,48 +19,49 @@ texture = ExtResource( 1 ) stretch_mode = 1 [node name="CenterContainer" type="CenterContainer" parent="."] +pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 2 ) [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] -margin_left = 354.0 -margin_top = 165.0 -margin_right = 669.0 -margin_bottom = 435.0 +margin_left = 408.0 +margin_top = 193.0 +margin_right = 616.0 +margin_bottom = 407.0 theme = ExtResource( 4 ) custom_constants/separation = 10 [node name="Spacer" type="Control" parent="CenterContainer/VBoxContainer"] -margin_right = 315.0 +margin_right = 208.0 margin_bottom = 30.0 rect_min_size = Vector2( 1, 30 ) [node name="ResumeButton" type="Button" parent="CenterContainer/VBoxContainer"] margin_top = 40.0 -margin_right = 315.0 -margin_bottom = 90.0 +margin_right = 208.0 +margin_bottom = 76.0 rect_min_size = Vector2( 208, 36 ) text = "Resume" [node name="MainMenuButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 100.0 -margin_right = 315.0 -margin_bottom = 150.0 +margin_top = 86.0 +margin_right = 208.0 +margin_bottom = 122.0 rect_min_size = Vector2( 208, 36 ) text = "Main Menu" [node name="ControlsButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 160.0 -margin_right = 315.0 -margin_bottom = 210.0 +margin_top = 132.0 +margin_right = 208.0 +margin_bottom = 168.0 rect_min_size = Vector2( 208, 36 ) text = "Controls" [node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer"] -margin_top = 220.0 -margin_right = 315.0 -margin_bottom = 270.0 +margin_top = 178.0 +margin_right = 208.0 +margin_bottom = 214.0 rect_min_size = Vector2( 208, 36 ) text = "Quit" diff --git a/godot/tests/test_titlescreen_planet/test_titlescreen.tscn b/godot/tests/test_titlescreen_planet/test_titlescreen.tscn index 03d1db0..970e597 100644 --- a/godot/tests/test_titlescreen_planet/test_titlescreen.tscn +++ b/godot/tests/test_titlescreen_planet/test_titlescreen.tscn @@ -12,10 +12,10 @@ [node name="test_titlescreen_planet" type="Spatial"] [node name="Camera" type="Camera" parent="."] -transform = Transform( -0.123083, -0.133377, 0.983393, -0.0204041, 0.991058, 0.131863, -0.992187, -0.00383517, -0.124704, 4.63606, 1.41359, 1.05785 ) +transform = Transform( -0.262413, -0.132575, 0.955805, -0.0204041, 0.991058, 0.131863, -0.96474, 0.0151002, -0.262772, 4.34589, 1.41359, 1.05785 ) [node name="meat_planet" parent="." instance=ExtResource( 1 )] -transform = Transform( -0.0141575, 0.273531, -0.418306, 0.409889, -0.233101, -0.166298, -0.285991, -0.347627, -0.217635, 0.0736001, 0.18823, -0.0757823 ) +transform = Transform( -0.0182938, 0.353447, -0.54052, 0.529643, -0.301205, -0.214884, -0.369546, -0.44919, -0.281219, 0.0736001, 0.18823, -0.0757823 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.791944, 0.610549, 0.00734885, -0.405596, 0.517027, 0.753774, 0.456416, -0.599928, 0.657093, 3.25392, 5.38699, -0.264825 ) @@ -23,8 +23,6 @@ light_color = Color( 0.317647, 0.0156863, 0.0156863, 1 ) light_energy = 1.5 shadow_enabled = true -[node name="grainy_shader" parent="." instance=ExtResource( 4 )] - [node name="WorldEnvironment" parent="." instance=ExtResource( 5 )] [node name="TitleMenu" type="Control" parent="."] @@ -70,43 +68,29 @@ custom_constants/separation = 10 [node name="PlayButton" type="Button" parent="TitleMenu/ButtonContainer"] margin_right = 300.0 -margin_bottom = 36.0 +margin_bottom = 80.0 +size_flags_vertical = 3 text = "Play" -[node name="Spacer" type="Control" parent="TitleMenu/ButtonContainer"] -margin_top = 46.0 -margin_right = 300.0 -margin_bottom = 76.0 -rect_min_size = Vector2( 1, 30 ) - [node name="Credits" type="Button" parent="TitleMenu/ButtonContainer"] -margin_top = 86.0 +margin_top = 90.0 margin_right = 300.0 -margin_bottom = 122.0 +margin_bottom = 170.0 +size_flags_vertical = 3 text = "Credits" -[node name="Spacer2" type="Control" parent="TitleMenu/ButtonContainer"] -margin_top = 132.0 -margin_right = 300.0 -margin_bottom = 162.0 -rect_min_size = Vector2( 1, 30 ) - [node name="Controls" type="Button" parent="TitleMenu/ButtonContainer"] -margin_top = 172.0 +margin_top = 180.0 margin_right = 300.0 -margin_bottom = 208.0 +margin_bottom = 260.0 +size_flags_vertical = 3 text = "Controls" -[node name="Spacer3" type="Control" parent="TitleMenu/ButtonContainer"] -margin_top = 218.0 -margin_right = 300.0 -margin_bottom = 248.0 -rect_min_size = Vector2( 1, 30 ) - [node name="QuitButton" type="Button" parent="TitleMenu/ButtonContainer"] -margin_top = 258.0 +margin_top = 270.0 margin_right = 300.0 -margin_bottom = 294.0 +margin_bottom = 350.0 +size_flags_vertical = 3 text = "Quit" [node name="BlackoutScreen" type="CanvasLayer" parent="TitleMenu"] @@ -126,6 +110,8 @@ autoplay = true [node name="BlackoutSound" type="AudioStreamPlayer" parent="TitleMenu"] stream = ExtResource( 2 ) +[node name="grainy_shader" parent="TitleMenu" instance=ExtResource( 4 )] + [connection signal="pressed" from="TitleMenu/ButtonContainer/PlayButton" to="TitleMenu" method="_on_PlayButton_pressed"] [connection signal="pressed" from="TitleMenu/ButtonContainer/Credits" to="TitleMenu" method="_on_Credits_pressed"] [connection signal="pressed" from="TitleMenu/ButtonContainer/Controls" to="TitleMenu" method="_on_Controls_pressed"]