violence

6 files changed, 114 insertions, 34 deletions

diff --git a/export_presets.cfg b/export_presets.cfg
index 19bb43d..795dc14 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -8,50 +8,49 @@ export_filter="all_resources"
 include_filter=""
 exclude_filter=""
 export_path="build/android.apk"
-patch_list=PoolStringArray(  )
 script_export_mode=1
 script_encryption_key=""
 
 [preset.0.options]
 
-graphics/32_bits_framebuffer=true
-xr_features/xr_mode=0
-xr_features/degrees_of_freedom=0
-xr_features/hand_tracking=0
-xr_features/focus_awareness=false
-one_click_deploy/clear_previous_install=false
 custom_template/debug=""
 custom_template/release=""
 custom_template/use_custom_build=false
-command_line/extra_args=""
+custom_template/export_format=0
+architectures/armeabi-v7a=true
+architectures/arm64-v8a=true
+architectures/x86=false
+architectures/x86_64=false
+keystore/debug=""
+keystore/debug_user=""
+keystore/debug_password=""
+keystore/release=""
+keystore/release_user=""
+keystore/release_password=""
+one_click_deploy/clear_previous_install=false
 version/code=1
 version/name="1.0"
 package/unique_name="org.godotengine.$genname"
 package/name=""
 package/signed=true
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+graphics/32_bits_framebuffer=true
+graphics/opengl_debug=false
+xr_features/xr_mode=0
+xr_features/degrees_of_freedom=0
+xr_features/hand_tracking=0
+xr_features/focus_awareness=false
 screen/immersive_mode=true
-screen/orientation=0
 screen/support_small=true
 screen/support_normal=true
 screen/support_large=true
 screen/support_xlarge=true
-screen/opengl_debug=false
-launcher_icons/main_192x192=""
-launcher_icons/adaptive_foreground_432x432=""
-launcher_icons/adaptive_background_432x432=""
-keystore/debug=""
-keystore/debug_user=""
-keystore/debug_password=""
-keystore/release=""
-keystore/release_user=""
-keystore/release_password=""
+command_line/extra_args=""
 apk_expansion/enable=false
 apk_expansion/SALT=""
 apk_expansion/public_key=""
-architectures/armeabi-v7a=true
-architectures/arm64-v8a=true
-architectures/x86=false
-architectures/x86_64=false
 permissions/custom_permissions=PoolStringArray(  )
 permissions/access_checkin_properties=false
 permissions/access_coarse_location=false
@@ -209,15 +208,42 @@ export_filter="all_resources"
 include_filter=""
 exclude_filter=""
 export_path=""
-patch_list=PoolStringArray(  )
 script_export_mode=1
 script_encryption_key=""
 
 [preset.1.options]
 
+custom_template/debug=""
+custom_template/release=""
+variant/export_type=0
 vram_texture_compression/for_desktop=true
 vram_texture_compression/for_mobile=false
 html/custom_html_shell=""
 html/head_include=""
-custom_template/release=""
+html/canvas_resize_policy=2
+html/experimental_virtual_keyboard=false
+
+[preset.2]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="build/linux.x86_64"
+script_export_mode=1
+script_encryption_key=""
+
+[preset.2.options]
+
 custom_template/debug=""
+custom_template/release=""
+binary_format/64_bits=true
+binary_format/embed_pck=false
+texture_format/bptc=false
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+texture_format/no_bptc_fallbacks=true
diff --git a/project.godot b/project.godot
index 80d51c1..ffe31ee 100644
--- a/project.godot
+++ b/project.godot
@@ -24,11 +24,6 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://components/card/card.gd"
 }, {
-"base": "",
-"class": "GitAPI",
-"language": "NativeScript",
-"path": "res://git_api.gdns"
-}, {
 "base": "Node2D",
 "class": "Level",
 "language": "GDScript",
@@ -48,7 +43,6 @@ _global_script_class_icons={
 "ButtonTest": "",
 "CameraTrackFollower": "",
 "Card": "",
-"GitAPI": "",
 "Level": "",
 "PathRenderer": "",
 "TextReveal": ""
@@ -69,13 +63,14 @@ Settings="*res://components/Settings.gd"
 
 window/size/width=1280
 window/size/height=720
+window/size/fullscreen=true
 mouse_cursor/custom_image="res://textures/icons/cursor.png"
 window/stretch/mode="2d"
 window/stretch/aspect="keep"
 
 [gdnative]
 
-singletons=[ "res://git_api.gdnlib" ]
+singletons=[  ]
 
 [gui]
 
@@ -113,3 +108,4 @@ vram_compression/import_etc=true
 vram_compression/import_etc2=false
 environment/default_clear_color=Color( 0.00392157, 0.0862745, 0.160784, 1 )
 environment/default_environment="res://default_env.tres"
+<<<<<<<Updatedupstreamenvironment/default_clear_color=Color( 0.00392157, 0.0862745, 0.160784, 1 )
diff --git a/scenes/introduction/check_mail.tscn b/scenes/introduction/check_mail.tscn
index eccdf90..b1b9fbb 100644
--- a/scenes/introduction/check_mail.tscn
+++ b/scenes/introduction/check_mail.tscn
@@ -96,6 +96,7 @@ align = 1
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
 [connection signal="text_changed" from="password" to="." method="_on_password_text_changed"]
 [connection signal="text_entered" from="password" to="." method="_on_password_text_entered"]
 [connection signal="on_click" from="Log in" to="." method="_on_Log_in_on_click"]
diff --git a/scenes/levels/level1.tscn b/scenes/levels/level1.tscn
new file mode 100644
index 0000000..7c52e6a
--- /dev/null
+++ b/scenes/levels/level1.tscn
@@ -0,0 +1,55 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scenes/levels/level1.gd" type="Script" id=1]
+[ext_resource path="res://components/button.tscn" type="PackedScene" id=2]
+
+[node name="Level2" type="Node2D"]
+position = Vector2( 640, 320 )
+script = ExtResource( 1 )
+
+[node name="ButtonHolder" type="Node2D" parent="."]
+
+[node name="Button" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -370.845, -187.832 )
+text = "1"
+fixed_width = 30
+
+[node name="Button2" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -256.483, 79.5727 )
+text = "2"
+fixed_width = 30
+
+[node name="Button3" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 269.918, 246.07 )
+text = "3"
+fixed_width = 30
+
+[node name="Button4" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -401.118, 15.6646 )
+text = "4"
+fixed_width = 30
+
+[node name="Button5" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -130.349, -46.5617 )
+text = "5"
+fixed_width = 30
+
+[node name="Button6" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -158.94, 224.207 )
+text = "6"
+fixed_width = 30
+
+[node name="Button7" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 128.647, 79.5727 )
+text = "7"
+fixed_width = 30
+
+[node name="Button8" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 21.0123, -209.696 )
+text = "8"
+fixed_width = 30
+
+[node name="Button9" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 216.1, -39.8346 )
+text = "9"
+fixed_width = 30
diff --git a/scenes/menu.tscn b/scenes/menu.tscn
index 71b525c..1d038c8 100644
--- a/scenes/menu.tscn
+++ b/scenes/menu.tscn
@@ -131,6 +131,7 @@ anims/startgame = SubResource( 2 )
 
 [node name="Outgoing" type="AnimationPlayer" parent="."]
 anims/tointro = SubResource( 3 )
+
 [connection signal="on_click" from="Content/Exit" to="." method="_on_Exit_on_click"]
 [connection signal="on_click" from="Content/Strart" to="." method="_on_Strart_on_click"]
 [connection signal="animation_finished" from="Transitions" to="." method="_on_Transitions_animation_finished"]
diff --git a/scenes/pause.gd b/scenes/pause.gd
index 57ab574..e65266e 100644
--- a/scenes/pause.gd
+++ b/scenes/pause.gd
@@ -6,7 +6,7 @@ onready var backgroud = $Sprite
 func pause():
 	pause_menu.visible = true
 	pause_menu.pause_mode = PAUSE_MODE_PROCESS # to be save
-	# get_tree().paused = true
+	get_tree().paused = true
 
 
 func _ready():
@@ -15,8 +15,9 @@ func _ready():
 
 func _on_Resume_on_click():
 	pause_menu.visible = false
-	# get_tree().paused = false
+	get_tree().paused = false
 
 
 func _on_Main_Menu_on_click():
+	get_tree().paused = false
 	get_tree().change_scene("res://scenes/menu.tscn")