Merge remote-tracking branch 'origin/main'

player/smallPlayer/menus/Score bar.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=3 format=3 uid="uid://cnvs3iophpe3n"]
+[gd_scene load_steps=4 format=3 uid="uid://cnvs3iophpe3n"]
 
 [ext_resource type="Script" uid="uid://biv656fho5bpy" path="res://player/smallPlayer/menus/progress_bar.gd" id="1_qy0dt"]
+[ext_resource type="Theme" uid="uid://bkwhpewn7wirw" path="res://startMenu/theme.tres" id="1_to1i2"]
 [ext_resource type="AudioStream" uid="uid://birua4ldxarek" path="res://collectables/crystal/sounds/Picked Coin Echo.wav" id="2_ekcnp"]
 
 [node name="Control" type="Control"]
@@ -16,6 +17,7 @@ grow_vertical = 2
 [node name="ProgressBar" type="ProgressBar" parent="CanvasLayer"]
 offset_right = 367.0
 offset_bottom = 27.0
+theme = ExtResource("1_to1i2")
 script = ExtResource("1_qy0dt")
 
 [node name="audioJungle" type="AudioStreamPlayer" parent="CanvasLayer/ProgressBar"]

startMenu/Main Menu.tscn

@@ -1,11 +1,10 @@
 [gd_scene load_steps=5 format=3 uid="uid://bj1x4w8ek53u1"]
 
+[ext_resource type="Theme" uid="uid://bkwhpewn7wirw" path="res://startMenu/theme.tres" id="1_1dhkb"]
 [ext_resource type="Script" uid="uid://dseq7dsrcpds6" path="res://startMenu/start_game.gd" id="1_psue8"]
 [ext_resource type="Script" uid="uid://br2tmqcmfkf7a" path="res://startMenu/exit_game.gd" id="2_1dhkb"]
 [ext_resource type="Texture2D" uid="uid://comgmbxospa8i" path="res://startMenu/titleScreen3.jpg" id="3_psue8"]
 
-[sub_resource type="SystemFont" id="SystemFont_7yr4w"]
-
 [node name="Control" type="Control"]
 layout_mode = 3
 anchors_preset = 15
@@ -20,8 +19,8 @@ offset_left = 367.0
 offset_top = 221.0
 offset_right = 777.0
 offset_bottom = 299.0
-theme_override_fonts/font = SubResource("SystemFont_7yr4w")
-theme_override_font_sizes/font_size = 51
+theme = ExtResource("1_1dhkb")
+theme_override_font_sizes/font_size = 26
 text = "Start"
 script = ExtResource("1_psue8")
 
@@ -31,8 +30,8 @@ offset_left = 368.0
 offset_top = 332.0
 offset_right = 778.0
 offset_bottom = 410.0
-theme_override_fonts/font = SubResource("SystemFont_7yr4w")
-theme_override_font_sizes/font_size = 51
+theme = ExtResource("1_1dhkb")
+theme_override_font_sizes/font_size = 26
 text = "Exit"
 script = ExtResource("2_1dhkb")
 

startMenu/Pixeled.ttf.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://c6w6wpv4fxblu"
+path="res://.godot/imported/Pixeled.ttf-0b960f1ca7defb0c2d86487aef4b8782.fontdata"
+
+[deps]
+
+source_file="res://startMenu/Pixeled.ttf"
+dest_files=["res://.godot/imported/Pixeled.ttf-0b960f1ca7defb0c2d86487aef4b8782.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+disable_embedded_bitmaps=true
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=4
+keep_rounding_remainders=true
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}

startMenu/Symtext.ttf.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://c8qur0cbvh1ju"
+path="res://.godot/imported/Symtext.ttf-15e6627ecdbe898b34e9cda05bc73ece.fontdata"
+
+[deps]
+
+source_file="res://startMenu/Symtext.ttf"
+dest_files=["res://.godot/imported/Symtext.ttf-15e6627ecdbe898b34e9cda05bc73ece.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+disable_embedded_bitmaps=true
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=4
+keep_rounding_remainders=true
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}

startMenu/theme.tres

@@ -0,0 +1,109 @@
+[gd_resource type="Theme" load_steps=9 format=3 uid="uid://bkwhpewn7wirw"]
+
+[ext_resource type="FontFile" uid="uid://c8qur0cbvh1ju" path="res://startMenu/Symtext.ttf" id="1_45rmb"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jsoma"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0.1, 0.1, 0.1, 0.3)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5p5ww"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(1, 1, 1, 0.75)
+draw_center = false
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+expand_margin_left = 2.0
+expand_margin_top = 2.0
+expand_margin_right = 2.0
+expand_margin_bottom = 2.0
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rd0ub"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0, 0.156863, 0.976471, 1)
+border_width_left = 5
+border_width_top = 5
+border_width_right = 5
+border_width_bottom = 5
+border_color = Color(0, 0, 0.443137, 1)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_sa4dl"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0, 0.535251, 0.970313, 1)
+border_width_left = 5
+border_width_top = 5
+border_width_right = 5
+border_width_bottom = 5
+border_color = Color(0, 0, 0.94902, 1)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_y4cfo"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0, 0, 0.337255, 1)
+border_width_left = 5
+border_width_top = 5
+border_width_right = 5
+border_width_bottom = 5
+border_color = Color(0, 0, 0, 1)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_psue8"]
+bg_color = Color(0, 0.533333, 0.968627, 0.188235)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1dhkb"]
+bg_color = Color(0, 0.156863, 0.976471, 1)
+
+[resource]
+Button/constants/align_to_largest_stylebox = 0
+Button/constants/h_separation = 4
+Button/constants/icon_max_width = 0
+Button/constants/outline_size = 0
+Button/font_sizes/font_size = 16
+Button/fonts/font = ExtResource("1_45rmb")
+Button/icons/icon = null
+Button/styles/disabled = SubResource("StyleBoxFlat_jsoma")
+Button/styles/focus = SubResource("StyleBoxFlat_5p5ww")
+Button/styles/hover = SubResource("StyleBoxFlat_rd0ub")
+Button/styles/normal = SubResource("StyleBoxFlat_sa4dl")
+Button/styles/pressed = SubResource("StyleBoxFlat_y4cfo")
+ProgressBar/styles/background = SubResource("StyleBoxFlat_psue8")
+ProgressBar/styles/fill = SubResource("StyleBoxFlat_1dhkb")