Merge dev and main branches

First merge with merge conflicts
apparrently bruh

PlayScratt.tscn

@@ -0,0 +1,20 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://Start.gd" type="Script" id=1]
+
+[node name="Node2D" type="Node2D"]
+script = ExtResource( 1 )
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+margin_left = 367.0
+margin_top = 215.0
+margin_right = 499.0
+margin_bottom = 283.0
+rect_scale = Vector2( 2, 2 )
+
+[node name="Back" type="Button" parent="VBoxContainer"]
+margin_right = 132.0
+margin_bottom = 20.0
+text = "Back"
+
+[connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_Back_pressed"]

Start.gd

@@ -18,7 +18,9 @@ func _ready():
 
 func _on_Information_pressed():
 	get_tree().change_scene("res://info.tscn")
-
+	
+func _on_Estartos_pressed():
+	get_tree().change_scene("res://PlayScratt.tscn")
 
 func _on_Back_pressed():
 	get_tree().change_scene("res://main_menu.tscn")

Start.tscn

@@ -17,11 +17,18 @@ margin_right = 132.0
 margin_bottom = 20.0
 text = "Information"
 
-[node name="Back" type="Button" parent="VBoxContainer"]
+[node name="Start Playing" type="Button" parent="VBoxContainer"]
 margin_top = 24.0
 margin_right = 132.0
 margin_bottom = 44.0
+text = "Start Playing"
+
+[node name="Back" type="Button" parent="VBoxContainer"]
+margin_top = 48.0
+margin_right = 132.0
+margin_bottom = 68.0
 text = "Back"
 
 [connection signal="pressed" from="VBoxContainer/Information" to="." method="_on_Information_pressed"]
+[connection signal="pressed" from="VBoxContainer/Start Playing" to="." method="_on_Estartos_pressed"]
 [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_Back_pressed"]

export_presets.cfg

@@ -0,0 +1,141 @@
+[preset.0]
+
+name="Mac OSX"
+platform="Mac OSX"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+script_export_mode=1
+script_encryption_key=""
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+application/name="noshg3"
+application/info="Made with Godot Engine"
+application/icon="res://icon.png"
+application/identifier="test.test.test"
+application/signature=""
+application/app_category="Games"
+application/short_version="a2f0d5a7cd"
+application/version="beta-a2f0d5a7cd"
+application/copyright="All Rights Reserved"
+display/high_res=false
+privacy/microphone_usage_description=""
+privacy/camera_usage_description=""
+privacy/location_usage_description=""
+privacy/address_book_usage_description=""
+privacy/calendar_usage_description=""
+privacy/photos_library_usage_description=""
+privacy/desktop_folder_usage_description=""
+privacy/documents_folder_usage_description=""
+privacy/downloads_folder_usage_description=""
+privacy/network_volumes_usage_description=""
+privacy/removable_volumes_usage_description=""
+codesign/enable=true
+codesign/identity=""
+codesign/timestamp=false
+codesign/hardened_runtime=false
+codesign/replace_existing_signature=false
+codesign/entitlements/custom_file=""
+codesign/entitlements/allow_jit_code_execution=false
+codesign/entitlements/allow_unsigned_executable_memory=false
+codesign/entitlements/allow_dyld_environment_variables=false
+codesign/entitlements/disable_library_validation=false
+codesign/entitlements/audio_input=false
+codesign/entitlements/camera=false
+codesign/entitlements/location=false
+codesign/entitlements/address_book=false
+codesign/entitlements/calendars=false
+codesign/entitlements/photos_library=false
+codesign/entitlements/apple_events=false
+codesign/entitlements/debugging=false
+codesign/entitlements/app_sandbox/enabled=false
+codesign/entitlements/app_sandbox/network_server=false
+codesign/entitlements/app_sandbox/network_client=false
+codesign/entitlements/app_sandbox/device_usb=false
+codesign/entitlements/app_sandbox/device_bluetooth=false
+codesign/entitlements/app_sandbox/files_downloads=0
+codesign/entitlements/app_sandbox/files_pictures=0
+codesign/entitlements/app_sandbox/files_music=0
+codesign/entitlements/app_sandbox/files_movies=0
+codesign/custom_options=PoolStringArray(  )
+notarization/enable=false
+notarization/apple_id_name=""
+notarization/apple_id_password=""
+notarization/apple_team_id=""
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+
+[preset.1]
+
+name="Windows Desktop"
+platform="Windows Desktop"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+script_export_mode=1
+script_encryption_key=""
+
+[preset.1.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
+codesign/enable=false
+codesign/identity_type=0
+codesign/identity=""
+codesign/password=""
+codesign/timestamp=false
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PoolStringArray(  )
+application/modify_resources=false
+application/icon=""
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name="noshg3"
+application/file_description=""
+application/copyright="All Rights Reserved"
+application/trademarks=""
+
+[preset.2]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+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

main_menu.tscn

@@ -1,7 +1,12 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://main_menu.gd" type="Script" id=1]
 [ext_resource path="res://icon.png" type="Texture" id=2]
+[ext_resource path="res://Fonts/Arimo-Bold.ttf" type="DynamicFontData" id=3]
+
+[sub_resource type="DynamicFont" id=1]
+size = 78
+font_data = ExtResource( 3 )
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource( 1 )
@@ -16,26 +21,28 @@ rect_scale = Vector2( 2, 2 )
 [node name="Start" type="Button" parent="VBoxContainer"]
 margin_right = 88.0
 margin_bottom = 20.0
+custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "Play"
 
 [node name="Exit" type="Button" parent="VBoxContainer"]
 margin_top = 24.0
 margin_right = 88.0
 margin_bottom = 44.0
+custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "Exit"
 
 [node name="RichTextLabel" type="RichTextLabel" parent="."]
-margin_left = 354.0
-margin_top = 179.0
-margin_right = 402.0
-margin_bottom = 195.0
-rect_scale = Vector2( 6, 6 )
+margin_left = 393.0
+margin_top = 196.0
+margin_right = 676.0
+margin_bottom = 296.0
+custom_fonts/normal_font = SubResource( 1 )
 text = "noshg3"
 scroll_active = false
 
 [node name="Icon" type="Sprite" parent="."]
-position = Vector2( 792, 218 )
-scale = Vector2( 2.92188, 2.92188 )
+position = Vector2( 796, 245 )
+scale = Vector2( 2.5625, 2.5625 )
 texture = ExtResource( 2 )
 
 [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_Start_pressed"]