aboutsummaryrefslogtreecommitdiffstats
path: root/godot/scenes/Game.tscn
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--godot/scenes/Game.tscn59
1 files changed, 59 insertions, 0 deletions
diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index 38a4ceb..710e5b5 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
[gd_scene load_steps=8 format=2]
[ext_resource path="res://native/Game.gdns" type="Script" id=1]
@@ -9,6 +10,14 @@
[sub_resource type="CubeMesh" id=2]
[sub_resource type="SphereMesh" id=3]
+=======
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://scenes/Game.gd" type="Script" id=1]
+[ext_resource path="res://scenes/levels/test_scene_movement/TestSceneMovement.tscn" type="PackedScene" id=2]
+[ext_resource path="res://assets/theme.tres" type="Theme" id=3]
+[ext_resource path="res://assets/fonts/format.tres" type="DynamicFont" id=4]
+>>>>>>> menu
[node name="Game" type="Spatial"]
script = ExtResource( 1 )
@@ -38,3 +47,53 @@ input/camera_mouse_sensitivity = Vector2( 0.005, 0.005 )
input/shoot_sensitivity = 0.005
[node name="TestScene" parent="." instance=ExtResource( 2 )]
+
+[node name="PausePopup" type="Control" parent="."]
+pause_mode = 2
+visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = 40.0
+margin_bottom = 40.0
+
+[node name="Panel" type="Panel" parent="PausePopup"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 300.0
+margin_top = 200.0
+margin_right = -300.0
+margin_bottom = -200.0
+theme = ExtResource( 3 )
+
+[node name="Label" type="Label" parent="PausePopup/Panel"]
+anchor_right = 1.0
+anchor_bottom = 0.3
+theme = ExtResource( 3 )
+custom_fonts/font = ExtResource( 4 )
+text = "Game is Paused"
+align = 1
+valign = 1
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PausePopup/Panel"]
+anchor_top = 0.3
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 500.0
+margin_right = -500.0
+custom_constants/separation = 20
+alignment = 1
+
+[node name="ResumeButton" type="Button" parent="PausePopup/Panel/VBoxContainer"]
+margin_top = 161.0
+margin_right = 360.0
+margin_bottom = 242.0
+text = "Resume"
+
+[node name="QuitButton" type="Button" parent="PausePopup/Panel/VBoxContainer"]
+margin_top = 262.0
+margin_right = 360.0
+margin_bottom = 343.0
+text = "Quit"
+
+[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"]
+[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]