Added better, more readable UI font

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

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

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

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

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={}

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")

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

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"

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

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