Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions assets/icons/MenuIcon.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_resource type="AtlasTexture" format=3 uid="uid://dat3kg2y636js"]

[ext_resource type="Texture2D" uid="uid://cg0l7tvqmtghr" path="res://assets/sprites/sheet_white1x.png" id="1_72tt8"]

[resource]
atlas = ExtResource("1_72tt8")
region = Rect2(250, 250, 50, 50)
4 changes: 3 additions & 1 deletion assets/styles/button/WoodButtonFocus.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://cth1ft7fq25dt"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://cth1ft7fq25dt"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_5lnn0"]

Expand All @@ -8,5 +8,7 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
modulate_color = Color(0.658824, 0.658824, 0.658824, 1)
4 changes: 3 additions & 1 deletion assets/styles/button/WoodButtonHover.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://ce37fd2xdmsy7"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://ce37fd2xdmsy7"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_138f4"]

Expand All @@ -8,5 +8,7 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
modulate_color = Color(0.658824, 0.658824, 0.658824, 1)
4 changes: 3 additions & 1 deletion assets/styles/button/WoodButtonPressed.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://80wgjlhsa7p4"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://80wgjlhsa7p4"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_dytkh"]

Expand All @@ -8,5 +8,7 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
modulate_color = Color(0.49, 0.49, 0.49, 1)
4 changes: 3 additions & 1 deletion assets/styles/check_button/WoodCheckButtonDisabled.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bcenqtjrurqb3"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://bcenqtjrurqb3"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_7y0l7"]

Expand All @@ -8,5 +8,7 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
modulate_color = Color(0.299547, 0.299547, 0.299547, 1)
4 changes: 3 additions & 1 deletion assets/styles/check_button/WoodCheckButtonFocus.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://dhvw5oabb2356"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://dhvw5oabb2356"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_s73hx"]

Expand All @@ -8,5 +8,7 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
modulate_color = Color(0.658824, 0.658824, 0.658824, 1)
4 changes: 3 additions & 1 deletion assets/styles/check_button/WoodCheckButtonHover.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://4vu2xq38q4vd"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://4vu2xq38q4vd"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_ra4w5"]

Expand All @@ -8,4 +8,6 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
4 changes: 3 additions & 1 deletion assets/styles/check_button/WoodCheckButtonNormal.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://cqaexm3rvo65s"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://cqaexm3rvo65s"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_bi0xk"]

Expand All @@ -8,4 +8,6 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(128, 432, 64, 64)
4 changes: 3 additions & 1 deletion assets/styles/check_button/WoodCheckButtonPressed.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bo1vcbwvokio"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://bo1vcbwvokio"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_7rj3j"]

Expand All @@ -8,4 +8,6 @@ texture_margin_left = 18.0
texture_margin_top = 18.0
texture_margin_right = 18.0
texture_margin_bottom = 18.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 512, 64, 64)
4 changes: 3 additions & 1 deletion assets/styles/line_edit/WoodLineEditFocus.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://c41k6hdc6ycfm"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://c41k6hdc6ycfm"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_duu01"]

Expand All @@ -8,4 +8,6 @@ texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(256, 512, 64, 64)
4 changes: 3 additions & 1 deletion assets/styles/line_edit/WoodLineEditNormal.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://dgqu4n0tpmwf3"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://dgqu4n0tpmwf3"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_rlcrs"]

Expand All @@ -8,4 +8,6 @@ texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 320, 64, 64)
4 changes: 3 additions & 1 deletion assets/styles/line_edit/WoodLineEditReadOnly.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bhv10thfsgndt"]
[gd_resource type="StyleBoxTexture" format=3 uid="uid://bhv10thfsgndt"]

[ext_resource type="Texture2D" uid="uid://bmxqeqo65xwt" path="res://assets/sprites/spritesheet-default.png" id="1_823t3"]

Expand All @@ -8,5 +8,7 @@ texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
axis_stretch_horizontal = 1
axis_stretch_vertical = 1
region_rect = Rect2(320, 320, 64, 64)
modulate_color = Color(0.190762, 0.190762, 0.190762, 1)
6 changes: 5 additions & 1 deletion entities/game/auto_close_popup/scenes/AutoClosePopup.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
[ext_resource type="Script" uid="uid://g8dk5ckx5t4d" path="res://entities/ui/gameplay_settings/scripts/AutoCloseRoundSlider.gd" id="3_sgjc8"]
[ext_resource type="Resource" uid="uid://t4b63t07og3" path="res://shared/resources/translations/assets/TimeForCompletion.tres" id="4_1kcrw"]
[ext_resource type="Script" uid="uid://chfatpxf8ucxr" path="res://shared/entities/clickable_button/ClickableButton.gd" id="5_tp0ur"]
[ext_resource type="Texture2D" uid="uid://dqv4i4y66gem" path="res://assets/icons/OkIcon.tres" id="7_1kcrw"]

[node name="AutoClosePopup" type="CenterContainer" unique_id=1954482098]
anchors_preset = 15
Expand Down Expand Up @@ -46,7 +47,7 @@ layout_mode = 2
text = "AUTO_COMPLETE_ROUND"
script = ExtResource("2_6fyx6")

[node name="AutoCompleteTimer" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/VBoxContainer" unique_id=369697036]
[node name="AutoCompleteTimer" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/VBoxContainer" unique_id=1295788756]
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
script = ExtResource("3_sgjc8")
Expand All @@ -63,13 +64,16 @@ custom_minimum_size = Vector2(200, 0)
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 1
min_value = 1.0
max_value = 5.0
value = 1.0

[node name="Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=244490318]
layout_mode = 2
size_flags_horizontal = 8
size_flags_vertical = 4
text = "OK"
icon = ExtResource("7_1kcrw")
script = ExtResource("5_tp0ur")

[connection signal="settings_loaded" from="." to="PanelContainer/MarginContainer/VBoxContainer/VBoxContainer/AutoCompleteRound" method="settings_loaded"]
Expand Down
2 changes: 2 additions & 0 deletions entities/game/card_template/scenes/CardTemplate.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ patch_margin_left = 16
patch_margin_top = 16
patch_margin_right = 16
patch_margin_bottom = 16
axis_stretch_horizontal = 1
axis_stretch_vertical = 1

[node name="TextFrame" type="NinePatchRect" parent="CanvasGroup" unique_id=1031246576 groups=["card_content"]]
offset_top = 500.0
Expand Down
6 changes: 6 additions & 0 deletions entities/game/memory_game/scenes/MemoryGame.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
[ext_resource type="PackedScene" uid="uid://d0vijthhc3d38" path="res://entities/game/players_overlay/scenes/PlayersOverlay.tscn" id="7_a7rnv"]
[ext_resource type="Script" uid="uid://bglvkbo4aydsy" path="res://entities/game/memory_game/scripts/Background.gd" id="7_kxmqb"]
[ext_resource type="Script" uid="uid://bxrsfyvew4ysu" path="res://entities/game/memory_game/scripts/PlayerInput.gd" id="9_86hnd"]
[ext_resource type="Texture2D" uid="uid://dat3kg2y636js" path="res://assets/icons/MenuIcon.tres" id="11_da0ji"]
[ext_resource type="PackedScene" uid="uid://cluwm03j8e11p" path="res://entities/game/game_pause_menu/scenes/GamePauseMenu.tscn" id="12_dfx06"]
[ext_resource type="Script" uid="uid://bsilbayat31i4" path="res://entities/game/tutorial_window/resources/TutorialInformation.gd" id="14_65xsg"]
[ext_resource type="Script" uid="uid://chfatpxf8ucxr" path="res://shared/entities/clickable_button/ClickableButton.gd" id="15_2f3xl"]
Expand Down Expand Up @@ -98,6 +99,7 @@ offset_right = 35.5
offset_bottom = 36.0
grow_horizontal = 2
text = "PAUSE_MENU"
icon = ExtResource("11_da0ji")
script = ExtResource("15_2f3xl")
can_request_debug_view = true
active = 4
Expand All @@ -122,9 +124,11 @@ grow_horizontal = 0
grow_vertical = 2

[node name="ZoomIn" type="Button" parent="CanvasLayer/VBoxContainer" unique_id=103762876]
custom_minimum_size = Vector2(100, 100)
layout_mode = 2
size_flags_vertical = 10
icon = ExtResource("18_pqxyo")
icon_alignment = 1
script = ExtResource("15_2f3xl")
can_request_debug_view = true
active = 4
Expand All @@ -133,9 +137,11 @@ button_behavior = SubResource("Resource_5dmxa")
pressed_action = SubResource("Resource_1wouk")

[node name="ZoomOut" type="Button" parent="CanvasLayer/VBoxContainer" unique_id=478318636]
custom_minimum_size = Vector2(100, 100)
layout_mode = 2
size_flags_vertical = 2
icon = ExtResource("20_ef4f6")
icon_alignment = 1
script = ExtResource("15_2f3xl")
can_request_debug_view = true
active = 4
Expand Down
8 changes: 4 additions & 4 deletions entities/ui/main_menu/scenes/MainMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,16 @@ pressed_action = SubResource("Resource_jopkp")
[node name="AvailableAiModes" parent="." unique_id=162745716 node_paths=PackedStringArray("align_source") instance=ExtResource("17_iuo3f")]
align_source = NodePath("../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quick Game AI")

[node name="AgainstPlayer" parent="AvailableAiModes/PanelContainer/AvailableAis" index="0"]
[node name="AgainstPlayer" parent="AvailableAiModes/PanelContainer/AvailableAis" parent_id_path=PackedInt32Array(162745716, 2025890688) index="0" unique_id=1825865624]
focus_neighbor_left = NodePath("../../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quick Game AI")

[node name="Easy_AI" parent="AvailableAiModes/PanelContainer/AvailableAis" index="1"]
[node name="Easy_AI" parent="AvailableAiModes/PanelContainer/AvailableAis" parent_id_path=PackedInt32Array(162745716, 2025890688) index="1" unique_id=968749708]
focus_neighbor_left = NodePath("../../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quick Game AI")

[node name="Normal_AI" parent="AvailableAiModes/PanelContainer/AvailableAis" index="2"]
[node name="Normal_AI" parent="AvailableAiModes/PanelContainer/AvailableAis" parent_id_path=PackedInt32Array(162745716, 2025890688) index="2" unique_id=1726860824]
focus_neighbor_left = NodePath("../../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quick Game AI")

[node name="Hard_AI" parent="AvailableAiModes/PanelContainer/AvailableAis" index="3"]
[node name="Hard_AI" parent="AvailableAiModes/PanelContainer/AvailableAis" parent_id_path=PackedInt32Array(162745716, 2025890688) index="3" unique_id=859255204]
focus_neighbor_left = NodePath("../../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quick Game AI")

[node name="TopDock" type="MarginContainer" parent="." unique_id=1013339364]
Expand Down
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
[application]

config/name="Samory"
config/version="0.19.6"
config/version="0.19.7"
config/tags=PackedStringArray("public")
run/main_scene="res://shared/global_entities/game_manager/scenes/GameManager.tscn"
config/features=PackedStringArray("4.6", "GL Compatibility")
Expand Down