From e3b3ae5ad5f8e8876d625fdd90c6f6975dac5705 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sat, 21 Dec 2024 17:26:51 -0700 Subject: [PATCH] Added better, more readable UI font --- asset_credits.org | 6 + .../twoweekendssans/two_weekends_sans.tres | 7 ++ .../two_weekends_sans_bold.tres | 8 ++ .../two_weekends_sans_italics.tres | 8 ++ .../twoweekendssans-regular.otf | Bin 0 -> 52280 bytes .../twoweekendssans-regular.otf.import | 34 ++++++ src/ui/main_theme.tres | 104 ++++++++++++++---- src/ui/menus/pause_menu/pause_menu.tscn | 18 +-- .../deathmatch_setup/deathmatch_setup.tscn | 100 ++--------------- .../practice_setup/practice_setup.tscn | 2 +- src/ui/menus/title_screen/title_screen.tscn | 2 +- 11 files changed, 166 insertions(+), 123 deletions(-) create mode 100644 assets/fonts/twoweekendssans/two_weekends_sans.tres create mode 100644 assets/fonts/twoweekendssans/two_weekends_sans_bold.tres create mode 100644 assets/fonts/twoweekendssans/two_weekends_sans_italics.tres create mode 100644 assets/fonts/twoweekendssans/twoweekendssans-regular.otf create mode 100644 assets/fonts/twoweekendssans/twoweekendssans-regular.otf.import diff --git a/asset_credits.org b/asset_credits.org index ce8f06f..c35409d 100644 --- a/asset_credits.org +++ b/asset_credits.org @@ -53,6 +53,12 @@ Asset credits *** License: OFL 1.1 +** Two Weekends Sans + +*** Retrieved from https://github.com/AlphaZTX/Two-Weekends-Sans + +*** License: OFL 1.1 + * Sound ** drive1.wav diff --git a/assets/fonts/twoweekendssans/two_weekends_sans.tres b/assets/fonts/twoweekendssans/two_weekends_sans.tres new file mode 100644 index 0000000..d4aab16 --- /dev/null +++ b/assets/fonts/twoweekendssans/two_weekends_sans.tres @@ -0,0 +1,7 @@ +[gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://dvgdisbh5rhw3"] + +[ext_resource type="FontFile" uid="uid://gmoy5so1q8pt" path="res://assets/fonts/twoweekendssans/twoweekendssans-regular.otf" id="1_ybe2l"] + +[resource] +base_font = ExtResource("1_ybe2l") +baseline_offset = 0.1 diff --git a/assets/fonts/twoweekendssans/two_weekends_sans_bold.tres b/assets/fonts/twoweekendssans/two_weekends_sans_bold.tres new file mode 100644 index 0000000..d222306 --- /dev/null +++ b/assets/fonts/twoweekendssans/two_weekends_sans_bold.tres @@ -0,0 +1,8 @@ +[gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://bwkgmcww503uf"] + +[ext_resource type="FontFile" uid="uid://gmoy5so1q8pt" path="res://assets/fonts/twoweekendssans/twoweekendssans-regular.otf" id="1_remmo"] + +[resource] +base_font = ExtResource("1_remmo") +variation_embolden = 0.8 +baseline_offset = 0.1 diff --git a/assets/fonts/twoweekendssans/two_weekends_sans_italics.tres b/assets/fonts/twoweekendssans/two_weekends_sans_italics.tres new file mode 100644 index 0000000..1ceaef6 --- /dev/null +++ b/assets/fonts/twoweekendssans/two_weekends_sans_italics.tres @@ -0,0 +1,8 @@ +[gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://bekh6jfretwuu"] + +[ext_resource type="FontFile" uid="uid://gmoy5so1q8pt" path="res://assets/fonts/twoweekendssans/twoweekendssans-regular.otf" id="1_q528l"] + +[resource] +base_font = ExtResource("1_q528l") +variation_transform = Transform2D(1, 0.2, 0, 1, 0, 0) +baseline_offset = 0.1 diff --git a/assets/fonts/twoweekendssans/twoweekendssans-regular.otf b/assets/fonts/twoweekendssans/twoweekendssans-regular.otf new file mode 100644 index 0000000000000000000000000000000000000000..a7f265a52aed2f533acdb0c2c83e352ae86e21d6 GIT binary patch literal 52280 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 VK%NZLGlMom7#u$mwW;4h{{;Yh^W*>k literal 0 HcmV?d00001 diff --git a/assets/fonts/twoweekendssans/twoweekendssans-regular.otf.import b/assets/fonts/twoweekendssans/twoweekendssans-regular.otf.import new file mode 100644 index 0000000..6786704 --- /dev/null +++ b/assets/fonts/twoweekendssans/twoweekendssans-regular.otf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://gmoy5so1q8pt" +path="res://.godot/imported/twoweekendssans-regular.otf-d398b11ad37476a7fdda48f9ce7f7243.fontdata" + +[deps] + +source_file="res://assets/fonts/twoweekendssans/twoweekendssans-regular.otf" +dest_files=["res://.godot/imported/twoweekendssans-regular.otf-d398b11ad37476a7fdda48f9ce7f7243.fontdata"] + +[params] + +Rendering=null +antialiasing=2 +generate_mipmaps=true +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=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[Resource("res://assets/fonts/promptfont/promptfont.otf")] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/src/ui/main_theme.tres b/src/ui/main_theme.tres index 9752809..7a4455c 100644 --- a/src/ui/main_theme.tres +++ b/src/ui/main_theme.tres @@ -1,14 +1,15 @@ -[gd_resource type="Theme" load_steps=15 format=3 uid="uid://diodjft5u2cck"] +[gd_resource type="Theme" load_steps=20 format=3 uid="uid://diodjft5u2cck"] [ext_resource type="FontFile" uid="uid://dsa0oh7c0h4pu" path="res://assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf" id="1_3rv2b"] [ext_resource type="FontFile" uid="uid://comihs66wounx" path="res://assets/fonts/Dokdo/Dokdo-Regular.ttf" id="1_eha6a"] -[ext_resource type="FontFile" uid="uid://b6gxwgomstkgu" path="res://assets/fonts/Geo/Geo-Italic.ttf" id="2_5ty6u"] +[ext_resource type="FontVariation" uid="uid://bekh6jfretwuu" path="res://assets/fonts/twoweekendssans/two_weekends_sans_italics.tres" id="1_xssha"] [ext_resource type="FontFile" uid="uid://dyog4ex5nqfat" path="res://assets/fonts/promptfont/promptfont.otf" id="2_8kux8"] -[ext_resource type="FontFile" uid="uid://s4c1kf0rk2mb" path="res://assets/fonts/Geo/Geo-Regular.ttf" id="3_cee6l"] [ext_resource type="FontFile" uid="uid://dyx4wcq8wlpbh" path="res://assets/fonts/Orbitron/static/Orbitron-Black.ttf" id="5_7lyjk"] [ext_resource type="FontVariation" uid="uid://y3lcfr4ys8d3" path="res://assets/fonts/Orbitron/Orbitron_Bold_Italics.tres" id="6_r7l37"] [ext_resource type="FontVariation" uid="uid://cjisjunqauv68" path="res://assets/fonts/Orbitron/Orbitron_Italics.tres" id="7_0c31n"] [ext_resource type="FontFile" uid="uid://bmv0pofrw1wh0" path="res://assets/fonts/Orbitron/static/Orbitron-Regular.ttf" id="8_njdo1"] +[ext_resource type="FontVariation" uid="uid://dvgdisbh5rhw3" path="res://assets/fonts/twoweekendssans/two_weekends_sans.tres" id="9_7pqpr"] +[ext_resource type="FontVariation" uid="uid://bwkgmcww503uf" path="res://assets/fonts/twoweekendssans/two_weekends_sans_bold.tres" id="9_uy5ad"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5pkn5"] content_margin_left = 16.0 @@ -49,32 +50,89 @@ corner_detail = 5 font_names = PackedStringArray("Monospace") generate_mipmaps = true +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nsmeb"] +content_margin_left = 36.0 +content_margin_top = 18.0 +content_margin_right = 36.0 +content_margin_bottom = 18.0 +bg_color = Color(0.1, 0.1, 0.1, 0.3) +corner_radius_top_left = 24 +corner_radius_top_right = 24 +corner_radius_bottom_right = 24 +corner_radius_bottom_left = 24 +corner_detail = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5k4vo"] +content_margin_left = 36.0 +content_margin_top = 18.0 +content_margin_right = 36.0 +content_margin_bottom = 18.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 = 24 +corner_radius_top_right = 24 +corner_radius_bottom_right = 24 +corner_radius_bottom_left = 24 +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_4vo7v"] +content_margin_left = 36.0 +content_margin_top = 18.0 +content_margin_right = 36.0 +content_margin_bottom = 18.0 +bg_color = Color(0.225, 0.225, 0.225, 0.6) +corner_radius_top_left = 24 +corner_radius_top_right = 24 +corner_radius_bottom_right = 24 +corner_radius_bottom_left = 24 +corner_detail = 5 + [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ynsl8"] content_margin_left = 36.0 -content_margin_top = 8.0 +content_margin_top = 18.0 content_margin_right = 36.0 -content_margin_bottom = 8.0 +content_margin_bottom = 18.0 bg_color = Color(0.1, 0.1, 0.1, 0.6) -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +corner_radius_top_left = 24 +corner_radius_top_right = 24 +corner_radius_bottom_right = 24 +corner_radius_bottom_left = 24 +corner_detail = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_twj44"] +content_margin_left = 36.0 +content_margin_top = 18.0 +content_margin_right = 36.0 +content_margin_bottom = 18.0 +bg_color = Color(0, 0, 0, 0.6) +corner_radius_top_left = 24 +corner_radius_top_right = 24 +corner_radius_bottom_right = 24 +corner_radius_bottom_left = 24 corner_detail = 5 [resource] -default_font = ExtResource("3_cee6l") -default_font_size = 18 +default_font = ExtResource("9_7pqpr") +default_font_size = 14 AlertButton/base_type = &"UIButton" AlertButton/colors/font_color = Color(0.819608, 0.196078, 0.196078, 1) AlertButton/colors/font_outline_color = Color(0, 0, 0, 1) AlertButton/constants/outline_size = 6 -AlertButton/font_sizes/font_size = 24 -AlertButton/fonts/font = ExtResource("2_5ty6u") +AlertButton/font_sizes/font_size = 21 +AlertButton/fonts/font = ExtResource("9_uy5ad") CancelButton/base_type = &"UIButton" CancelButton/colors/font_outline_color = Color(0, 0, 0, 1) CancelButton/constants/outline_size = 6 -CancelButton/font_sizes/font_size = 24 -CancelButton/fonts/font = ExtResource("2_5ty6u") +CancelButton/font_sizes/font_size = 21 +CancelButton/fonts/font = ExtResource("9_uy5ad") ChannelMixerIcon/base_type = &"Label" ChannelMixerIcon/colors/font_color = Color(1, 1, 0.870588, 1) ChannelMixerIcon/colors/font_outline_color = Color(0, 0, 0, 1) @@ -146,11 +204,13 @@ InputPrompt/colors/font_color = Color(1, 1, 0.870588, 1) InputPrompt/constants/outline_size = 8 InputPrompt/font_sizes/font_size = 32 InputPrompt/fonts/font = ExtResource("2_8kux8") +InputPromptContainer/base_type = &"HBoxContainer" +InputPromptContainer/constants/separation = 8 PauseMenuButton/base_type = &"UIButton" PauseMenuButton/colors/font_outline_color = Color(0, 0, 0, 1) PauseMenuButton/constants/outline_size = 6 -PauseMenuButton/font_sizes/font_size = 32 -PauseMenuButton/fonts/font = ExtResource("2_5ty6u") +PauseMenuButton/font_sizes/font_size = 21 +PauseMenuButton/fonts/font = ExtResource("9_uy5ad") PlayerNameInput/base_type = &"LineEdit" PlayerNameInput/font_sizes/font_size = 32 PlayerNameInput/fonts/font = ExtResource("1_3rv2b") @@ -163,8 +223,8 @@ SettingsInputLabel/base_type = &"Label" SettingsInputLabel/colors/font_color = Color(1, 1, 0.870588, 1) SettingsInputLabel/colors/font_outline_color = Color(0, 0, 0, 1) SettingsInputLabel/constants/outline_size = 6 -SettingsInputLabel/font_sizes/font_size = 36 -SettingsInputLabel/fonts/font = ExtResource("2_5ty6u") +SettingsInputLabel/font_sizes/font_size = 32 +SettingsInputLabel/fonts/font = ExtResource("1_xssha") SettingsList/base_type = &"VBoxContainer" SettingsList/constants/separation = 4 SettingsListMargin/base_type = &"MarginContainer" @@ -173,7 +233,7 @@ SettingsListMargin/constants/margin_left = 8 SettingsListMargin/constants/margin_right = 8 SettingsListMargin/constants/margin_top = 8 SettingsPageContainer/base_type = &"MarginContainer" -SettingsPageContainer/constants/margin_bottom = 72 +SettingsPageContainer/constants/margin_bottom = 88 SettingsPageContainer/constants/margin_left = 72 SettingsPageContainer/constants/margin_right = 72 SettingsPageContainer/constants/margin_top = 72 @@ -198,4 +258,8 @@ TitleScreenMenuLabel/colors/font_outline_color = Color(0, 0, 0, 1) TitleScreenMenuLabel/constants/outline_size = 6 TitleScreenMenuLabel/font_sizes/font_size = 32 UIButton/base_type = &"Button" +UIButton/styles/disabled = SubResource("StyleBoxFlat_nsmeb") +UIButton/styles/focus = SubResource("StyleBoxFlat_5k4vo") +UIButton/styles/hover = SubResource("StyleBoxFlat_4vo7v") UIButton/styles/normal = SubResource("StyleBoxFlat_ynsl8") +UIButton/styles/pressed = SubResource("StyleBoxFlat_twj44") diff --git a/src/ui/menus/pause_menu/pause_menu.tscn b/src/ui/menus/pause_menu/pause_menu.tscn index 1e829af..8ff8729 100644 --- a/src/ui/menus/pause_menu/pause_menu.tscn +++ b/src/ui/menus/pause_menu/pause_menu.tscn @@ -102,13 +102,14 @@ layout_mode = 2 [node name="MarginContainer" type="MarginContainer" parent="QuitConfirm/PanelContainer"] layout_mode = 2 -theme_override_constants/margin_left = 8 -theme_override_constants/margin_top = 8 -theme_override_constants/margin_right = 8 -theme_override_constants/margin_bottom = 8 +theme_override_constants/margin_left = 16 +theme_override_constants/margin_top = 16 +theme_override_constants/margin_right = 16 +theme_override_constants/margin_bottom = 16 [node name="VBoxContainer" type="VBoxContainer" parent="QuitConfirm/PanelContainer/MarginContainer"] layout_mode = 2 +theme_override_constants/separation = 16 [node name="Label" type="Label" parent="QuitConfirm/PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 @@ -147,13 +148,14 @@ layout_mode = 2 [node name="MarginContainer" type="MarginContainer" parent="EndGameConfirm/PanelContainer"] layout_mode = 2 -theme_override_constants/margin_left = 8 -theme_override_constants/margin_top = 8 -theme_override_constants/margin_right = 8 -theme_override_constants/margin_bottom = 8 +theme_override_constants/margin_left = 16 +theme_override_constants/margin_top = 16 +theme_override_constants/margin_right = 16 +theme_override_constants/margin_bottom = 16 [node name="VBoxContainer" type="VBoxContainer" parent="EndGameConfirm/PanelContainer/MarginContainer"] layout_mode = 2 +theme_override_constants/separation = 16 [node name="Label" type="Label" parent="EndGameConfirm/PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 diff --git a/src/ui/menus/title_screen/deathmatch_setup/deathmatch_setup.tscn b/src/ui/menus/title_screen/deathmatch_setup/deathmatch_setup.tscn index f475f47..31373de 100644 --- a/src/ui/menus/title_screen/deathmatch_setup/deathmatch_setup.tscn +++ b/src/ui/menus/title_screen/deathmatch_setup/deathmatch_setup.tscn @@ -1,71 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://ccx2u5oli6men"] +[gd_scene load_steps=8 format=3 uid="uid://ccx2u5oli6men"] [ext_resource type="Script" path="res://src/ui/menus/title_screen/deathmatch_setup/deathmatch_setup.gd" id="1_bchix"] [ext_resource type="PackedScene" uid="uid://cr13d4p235b5y" path="res://src/ui/menus/title_screen/deathmatch_setup/player_setup/player_setup.tscn" id="2_on4ab"] +[ext_resource type="Script" path="res://src/ui/decorations/fader.gd" id="3_krl60"] [ext_resource type="PackedScene" uid="uid://b47goj32i6sdh" path="res://src/ui/elements/input_prompt/input_prompt.tscn" id="4_2vecx"] -[sub_resource type="Animation" id="Animation_r61vj"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("GamepadStartSymbol:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("KeyboardStartSymbol:modulate") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 1)] -} - -[sub_resource type="Animation" id="Animation_c3p73"] -resource_name = "rotate" -length = 4.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("GamepadStartSymbol:modulate") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 1.6, 2.4, 3.2, 4), -"transitions": PackedFloat32Array(1, 0.618, 1, 1.618, 1), -"update": 0, -"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("KeyboardStartSymbol:modulate") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0, 0.8, 1.6, 4, 4.8), -"transitions": PackedFloat32Array(1, 1.618, 1, 0.618, 1), -"update": 0, -"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0), Color(1, 1, 1, 0), Color(1, 1, 1, 1)] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_5sl0m"] -_data = { -"RESET": SubResource("Animation_r61vj"), -"rotate": SubResource("Animation_c3p73") -} - [sub_resource type="Animation" id="Animation_x4wqc"] length = 0.001 tracks/0/type = "value" @@ -158,7 +97,7 @@ layout_mode = 2 theme_override_constants/margin_left = 32 theme_override_constants/margin_top = 32 theme_override_constants/margin_right = 32 -theme_override_constants/margin_bottom = 80 +theme_override_constants/margin_bottom = 92 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] layout_mode = 2 @@ -262,51 +201,26 @@ grow_vertical = 2 layout_mode = 2 alignment = 1 -[node name="SymbolBlinker" type="Control" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer"] +[node name="Fader" type="Control" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer"] custom_minimum_size = Vector2(64, 64) layout_mode = 2 -mouse_filter = 1 +script = ExtResource("3_krl60") -[node name="GamepadStartSymbol" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer/SymbolBlinker" instance=ExtResource("4_2vecx")] -modulate = Color(1, 1, 1, 0) +[node name="GamepadStartSymbol" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer/Fader" instance=ExtResource("4_2vecx")] layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -56.5 -offset_top = -19.5 -offset_right = 56.5 -offset_bottom = 19.5 text = "❓" horizontal_alignment = 1 action = &"ui_start" show_name = false event_index = 1 -[node name="KeyboardStartSymbol" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer/SymbolBlinker" instance=ExtResource("4_2vecx")] +[node name="KeyboardStartSymbol" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer/Fader" instance=ExtResource("4_2vecx")] layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -56.5 -offset_top = -19.5 -offset_right = 56.5 -offset_bottom = 19.5 text = "❓" horizontal_alignment = 1 action = &"ui_start" show_name = false -[node name="AnimationPlayer" type="AnimationPlayer" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer/SymbolBlinker"] -libraries = { -"": SubResource("AnimationLibrary_5sl0m") -} -autoplay = "rotate" - [node name="Label2" type="Label" parent="MarginContainer/VBoxContainer/PlayersContainer/MarginContainer/VBoxContainer/ScrollContainer/MarginContainer/HBoxContainer/AddPlayerButton/CenterContainer/VBoxContainer"] layout_mode = 2 text = "DM_ADD_PLAYER" diff --git a/src/ui/menus/title_screen/practice_setup/practice_setup.tscn b/src/ui/menus/title_screen/practice_setup/practice_setup.tscn index dbe9edb..3455688 100644 --- a/src/ui/menus/title_screen/practice_setup/practice_setup.tscn +++ b/src/ui/menus/title_screen/practice_setup/practice_setup.tscn @@ -116,7 +116,7 @@ layout_mode = 2 theme_override_constants/margin_left = 32 theme_override_constants/margin_top = 32 theme_override_constants/margin_right = 32 -theme_override_constants/margin_bottom = 80 +theme_override_constants/margin_bottom = 92 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] layout_mode = 2 diff --git a/src/ui/menus/title_screen/title_screen.tscn b/src/ui/menus/title_screen/title_screen.tscn index 04177e5..0948307 100644 --- a/src/ui/menus/title_screen/title_screen.tscn +++ b/src/ui/menus/title_screen/title_screen.tscn @@ -1482,7 +1482,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="PressStart" type="Label" parent="Menu"] -modulate = Color(1, 1, 1, 0.124112) +modulate = Color(1, 1, 1, 0.976854) layout_mode = 1 anchors_preset = 8 anchor_left = 0.5