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
3 changes: 3 additions & 0 deletions assets/audio/effect/animation_enter_end.ogg
Git LFS file not shown
19 changes: 19 additions & 0 deletions assets/audio/effect/animation_enter_end.ogg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://c07nu4inslkw7"
path="res://.godot/imported/animation_enter_end.ogg-b6d110a97278b1c74c778315265fcb20.oggvorbisstr"

[deps]

source_file="res://assets/audio/effect/animation_enter_end.ogg"
dest_files=["res://.godot/imported/animation_enter_end.ogg-b6d110a97278b1c74c778315265fcb20.oggvorbisstr"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 14 additions & 5 deletions de.po
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.8\n"
"X-Generator: Poedit 3.9\n"

#: entities/game/auto_close_popup/scenes/AutoClosePopup.tscn
msgid "AUTO_CLOSE_POPUP_BODY"
Expand Down Expand Up @@ -155,10 +155,6 @@ msgstr "Platzhalter"
msgid "TITLE"
msgstr "Title"

#: entities/game/tutorial_window/scenes/TutorialWindow.tscn
msgid "BODY"
msgstr "Körper"

#: entities/game/tutorial_window/scenes/TutorialWindow.tscn
msgid "COMPLETE_TUTORIAL_TOOLTIP"
msgstr "Das Tutorial wird abgebrochen und es wird keine weitere Hilfe geben"
Expand Down Expand Up @@ -1450,6 +1446,16 @@ msgstr "Aktiviere oder deaktiviere VSync für das Spiel"
msgid "V_SYNC"
msgstr "V Sync"

#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn
msgid "ENTER_ANIMATE_CONTROLS_DESCRIPTION"
msgstr ""
"Wenn diese Option aktiviert wird, werden diverse Menüs beim laden animiert. "
"Dies umfasst Panels und Buttons."

#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn
msgid "ENTER_ANIMATE_CONTROLS"
msgstr "Animierte Menüs"

#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn
msgid "UI_SCALE_TOOLTIP"
msgstr ""
Expand All @@ -1467,6 +1473,9 @@ msgstr "UI Skalierung zurücksetzten"
msgid "Samory"
msgstr ""

#~ msgid "BODY"
#~ msgstr "Körper"

#~ msgid "UI_SCALE_DECREASE"
#~ msgstr "UI Skalierung verkleinern"

Expand Down
19 changes: 14 additions & 5 deletions en.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.8\n"
"X-Generator: Poedit 3.9\n"

#: entities/game/auto_close_popup/scenes/AutoClosePopup.tscn
msgid "AUTO_CLOSE_POPUP_BODY"
Expand Down Expand Up @@ -109,10 +109,6 @@ msgstr "PLACEHOLDER"
msgid "TITLE"
msgstr "Title"

#: entities/game/tutorial_window/scenes/TutorialWindow.tscn
msgid "BODY"
msgstr "Body"

#: entities/game/tutorial_window/scenes/TutorialWindow.tscn
msgid "COMPLETE_TUTORIAL_TOOLTIP"
msgstr "Will stop the tutorial and not additional help will be provided"
Expand Down Expand Up @@ -1357,6 +1353,16 @@ msgstr "Enable or disable vsync for the game"
msgid "V_SYNC"
msgstr "VSync"

#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn
msgid "ENTER_ANIMATE_CONTROLS_DESCRIPTION"
msgstr ""
"If this is set to true menus might play an animation if buttons or panels do "
"enter. If this is not wanted, disable the option."

#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn
msgid "ENTER_ANIMATE_CONTROLS"
msgstr "Animate Menus"

#: entities/ui/graphic_settings/scenes/GraphicSettings.tscn
msgid "UI_SCALE_TOOLTIP"
msgstr ""
Expand All @@ -1374,6 +1380,9 @@ msgstr "Reset UI scaling"
msgid "Samory"
msgstr ""

#~ msgid "BODY"
#~ msgstr "Body"

#~ msgid "UI_SCALE_DECREASE"
#~ msgstr "Decrease UI scaling"

Expand Down
9 changes: 9 additions & 0 deletions entities/ui/graphic_settings/scenes/GraphicSettings.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[ext_resource type="Script" uid="uid://dxepefpl817n7" path="res://entities/ui/graphic_settings/scripts/WindowModeSelection.gd" id="3_cvhsj"]
[ext_resource type="Script" uid="uid://b6p42kfefnyc0" path="res://entities/ui/graphic_settings/scripts/VsyncButton.gd" id="4_r24jl"]
[ext_resource type="Script" uid="uid://b3mbd6eeylk66" path="res://entities/ui/graphic_settings/scripts/UiScale.gd" id="5_180xw"]
[ext_resource type="Script" uid="uid://eqtw0pawym83" path="res://entities/ui/graphic_settings/scripts/EnterAnimateControls.gd" id="5_fnqnv"]
[ext_resource type="Script" uid="uid://crpang1vb3yxa" path="res://entities/ui/graphic_settings/scripts/UiScaleLabel.gd" id="6_fnqnv"]
[ext_resource type="PackedScene" uid="uid://cf4ydk76w8s3l" path="res://entities/ui/button_scroll_bar/scene/ButtonScrollBar.tscn" id="7_r24jl"]

Expand Down Expand Up @@ -43,6 +44,12 @@ tooltip_text = "VSYNC_SETTING_TOOLTIP"
text = "V_SYNC"
script = ExtResource("4_r24jl")

[node name="EnterAnimate" type="CheckButton" parent="VBoxContainer" unique_id=1293576611]
layout_mode = 2
tooltip_text = "ENTER_ANIMATE_CONTROLS_DESCRIPTION"
text = "ENTER_ANIMATE_CONTROLS"
script = ExtResource("5_fnqnv")

[node name="UiScale" type="HBoxContainer" parent="VBoxContainer" unique_id=1692092135]
layout_mode = 2
script = ExtResource("5_180xw")
Expand Down Expand Up @@ -70,8 +77,10 @@ text = "RESET_SCALING"
[connection signal="settings_changed" from="." to="VBoxContainer/WindowModeSelection" method="settings_loaded"]
[connection signal="settings_changed" from="." to="VBoxContainer/VSync" method="settings_loaded"]
[connection signal="settings_changed" from="." to="VBoxContainer/UiScale" method="settings_changed"]
[connection signal="settings_changed" from="." to="VBoxContainer/EnterAnimate" method="settings_loaded"]
[connection signal="window_mode_changed" from="VBoxContainer/WindowModeSelection" to="." method="change_window_mode"]
[connection signal="toggled" from="VBoxContainer/VSync" to="." method="change_v_sync"]
[connection signal="toggled" from="VBoxContainer/EnterAnimate" to="." method="change_enter_animate"]
[connection signal="value_changed" from="VBoxContainer/UiScale" to="VBoxContainer/UiScale/ButtonScrollBar" method="set_value"]
[connection signal="drag_ended" from="VBoxContainer/UiScale/ButtonScrollBar" to="VBoxContainer/UiScale" method="update_preview"]
[connection signal="value_changed" from="VBoxContainer/UiScale/ButtonScrollBar" to="." method="change_ui_scale"]
Expand Down
6 changes: 6 additions & 0 deletions entities/ui/graphic_settings/scripts/EnterAnimateControls.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extends ClickableToggle

func settings_loaded(settings: SettingsResource) -> void:
button_pressed = settings.enter_animate_controls
toggled.emit(button_pressed)
starts_ready = true
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://eqtw0pawym83
6 changes: 5 additions & 1 deletion entities/ui/graphic_settings/scripts/GraphicSettings.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ extends PanelContainer

signal window_mode_changed(new_mode: DisplayServer.WindowMode)
signal v_sync_changed(state: bool)
signal enter_animate_changed(state: bool)
signal ui_scale_changed(new_scale: float)
signal settings_changed(setting: SettingsResource)
signal language_changed(language_code: String)
Expand All @@ -19,4 +20,7 @@ func settings_loaded(settings: SettingsResource) -> void:
settings_changed.emit(settings)

func change_language(language_code: String) -> void:
language_changed.emit(language_code)
language_changed.emit(language_code)

func change_enter_animate(state: bool) -> void:
enter_animate_changed.emit(state)
53 changes: 37 additions & 16 deletions entities/ui/links/scenes/links.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@
[ext_resource type="Texture2D" uid="uid://d1fc7nwftgx4y" path="res://assets/icons/QuestionIcon.tres" id="2_1cih1"]
[ext_resource type="Script" uid="uid://qgxq73rkwfr3" path="res://shared/entities/clickable_button/resources/OpenSystemFolder.gd" id="3_f67t6"]
[ext_resource type="Script" uid="uid://chfatpxf8ucxr" path="res://shared/entities/clickable_button/ClickableButton.gd" id="3_l56ar"]
[ext_resource type="Script" uid="uid://bo2i1r57xlsqc" path="res://shared/entities/clickable_button/resources/animations/ControlScaleAnimation.gd" id="3_m7voa"]
[ext_resource type="Resource" uid="uid://b0gd4uwnid78l" path="res://shared/entities/clickable_button/assets/animations/DefaultButtonAnimation.tres" id="4_f67t6"]
[ext_resource type="Script" uid="uid://rxshx7ma8nn3" path="res://shared/global_entities/control_animation_component/scripts/ControlAnimationComponent.gd" id="4_m7voa"]
[ext_resource type="Resource" uid="uid://cakox3m20wk7q" path="res://shared/resources/control_animation/resources/DefaultButtonEnter.tres" id="5_6wbyd"]
[ext_resource type="Script" uid="uid://dvrn3p7xl4tpl" path="res://shared/entities/clickable_button/resources/actions/OpenLinkAction.gd" id="5_m7voa"]
[ext_resource type="Texture2D" uid="uid://cln3v63hwble8" path="res://assets/icons/HomeIcon.tres" id="6_6wbyd"]
[ext_resource type="Resource" uid="uid://by7h6kfigwa21" path="res://shared/resources/control_animation/resources/DefaultButtonAnimation.tres" id="6_dpv13"]
[ext_resource type="Texture2D" uid="uid://cswswoet5pppp" path="res://assets/icons/ShareIcon.tres" id="7_dpv13"]
[ext_resource type="Texture2D" uid="uid://cat86qdkpvga8" path="res://assets/icons/WarningIcon.tres" id="8_63oac"]

[sub_resource type="Resource" id="Resource_6wbyd"]
script = ExtResource("3_m7voa")
metadata/_custom_type_script = "uid://bo2i1r57xlsqc"

[sub_resource type="Resource" id="Resource_m7voa"]
script = ExtResource("3_f67t6")
user_path = "user://custom_decks/"
Expand Down Expand Up @@ -52,54 +49,78 @@ icon = ExtResource("1_1cih1")
script = ExtResource("3_l56ar")
active = 2
only_visible_if_custom_deck_active = true
animation_resource = SubResource("Resource_6wbyd")
pressed_action = SubResource("Resource_m7voa")

[node name="ControlAnimationComponent" type="Node" parent="OpenCustomDeckFolder" unique_id=977552176]
script = ExtResource("4_m7voa")
enter_values = ExtResource("5_6wbyd")
hover_values = ExtResource("6_dpv13")
metadata/_custom_type_script = "uid://rxshx7ma8nn3"

[node name="HowToPlay" type="Button" parent="." unique_id=1979169242]
layout_mode = 2
size_flags_horizontal = 8
tooltip_text = "HOW_TO_PLAY"
focus_neighbor_left = NodePath("../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quit")
focus_neighbor_top = NodePath("../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quit")
focus_neighbor_right = NodePath("../GitHubRepository")
focus_next = NodePath("../GitHubRepository")
focus_previous = NodePath("../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quit")
shortcut = ExtResource("1_2ay2a")
icon = ExtResource("2_1cih1")
script = ExtResource("3_l56ar")
animation_resource = ExtResource("4_f67t6")
pressed_action = SubResource("Resource_ssyfv")

[node name="ControlAnimationComponent" type="Node" parent="HowToPlay" unique_id=1737761850 node_paths=PackedStringArray("await_component")]
script = ExtResource("4_m7voa")
await_component = NodePath("../../OpenCustomDeckFolder/ControlAnimationComponent")
enter_values = ExtResource("5_6wbyd")
hover_values = ExtResource("6_dpv13")
metadata/_custom_type_script = "uid://rxshx7ma8nn3"

[node name="GitHubRepository" type="Button" parent="." unique_id=511307644]
layout_mode = 2
size_flags_horizontal = 8
tooltip_text = "GITHUB_REPOSITORY_BUTTON"
focus_neighbor_left = NodePath("../HowToPlay")
focus_neighbor_top = NodePath("../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quit")
focus_neighbor_right = NodePath("../OpenGameSite")
icon = ExtResource("6_6wbyd")
script = ExtResource("3_l56ar")
animation_resource = ExtResource("4_f67t6")
pressed_action = SubResource("Resource_bmgck")

[node name="ControlAnimationComponent" type="Node" parent="GitHubRepository" unique_id=1581642327 node_paths=PackedStringArray("await_component")]
script = ExtResource("4_m7voa")
await_component = NodePath("../../HowToPlay/ControlAnimationComponent")
enter_values = ExtResource("5_6wbyd")
hover_values = ExtResource("6_dpv13")
metadata/_custom_type_script = "uid://rxshx7ma8nn3"

[node name="OpenGameSite" type="Button" parent="." unique_id=540372814]
layout_mode = 2
tooltip_text = "GAME_PAGE"
focus_neighbor_left = NodePath("../GitHubRepository")
focus_neighbor_top = NodePath("../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quit")
focus_neighbor_right = NodePath("../ReportBug")
icon = ExtResource("7_dpv13")
script = ExtResource("3_l56ar")
animation_resource = ExtResource("4_f67t6")
pressed_action = SubResource("Resource_7m08p")

[node name="ControlAnimationComponent" type="Node" parent="OpenGameSite" unique_id=1020999169 node_paths=PackedStringArray("await_component")]
script = ExtResource("4_m7voa")
await_component = NodePath("../../GitHubRepository/ControlAnimationComponent")
enter_values = ExtResource("5_6wbyd")
hover_values = ExtResource("6_dpv13")
metadata/_custom_type_script = "uid://rxshx7ma8nn3"

[node name="ReportBug" type="Button" parent="." unique_id=129169406]
layout_mode = 2
tooltip_text = "REPORT_BUG"
focus_neighbor_left = NodePath("../OpenGameSite")
focus_neighbor_top = NodePath("../../../CenterMainMenu/PanelContainer/MarginContainer/VBoxContainer/Quit")
focus_neighbor_right = NodePath("../HowToPlay")
icon = ExtResource("8_63oac")
script = ExtResource("3_l56ar")
animation_resource = ExtResource("4_f67t6")
pressed_action = SubResource("Resource_q0p35")

[node name="ControlAnimationComponent" type="Node" parent="ReportBug" unique_id=457431092 node_paths=PackedStringArray("await_component")]
script = ExtResource("4_m7voa")
await_component = NodePath("../../OpenGameSite/ControlAnimationComponent")
enter_values = ExtResource("5_6wbyd")
hover_values = ExtResource("6_dpv13")
metadata/_custom_type_script = "uid://rxshx7ma8nn3"
Loading
Loading