Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better umlauts support #1125

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Better umlauts support #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c1ef03
Added fallback fonts to PlayerSelection and SelectionScreen, because …
tafode Apr 28, 2023
96835dc
Merge branch 'notapixelstudio:main' into better-umlauts-support
tafode Apr 29, 2023
fee52bd
Added fallback font for better Umlaut support
tafode Apr 30, 2023
743be9f
Merge branch 'notapixelstudio:main' into better-umlauts-support
tafode May 2, 2023
c0daaef
Added new Default Fonts with size 21 and size 38, used those in the H…
tafode May 3, 2023
bece800
Merge branch 'notapixelstudio:main' into better-umlauts-support
tafode May 17, 2023
74c4efe
Merge branch 'notapixelstudio:main' into better-umlauts-support
tafode May 29, 2023
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
17 changes: 17 additions & 0 deletions godot/assets/fonts/DefaultFont21.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[gd_resource type="DynamicFont" load_steps=7 format=2]

[ext_resource path="res://assets/fonts/Pixel-Powerline-440555/Pixel Powerline.otf" type="DynamicFontData" id=1]
[ext_resource path="res://assets/fonts/Red-Hat-Text/redhattext/RedHatText-Bold.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://assets/fonts/LINE_Seed_JP/Desktop/OTF/LINESeedJP_OTF_Bd.otf" type="DynamicFontData" id=3]
[ext_resource path="res://assets/fonts/NaverNanumSquareNeo/OTF/NanumSquareNeoOTF-cBd.otf" type="DynamicFontData" id=4]
[ext_resource path="res://assets/fonts/kose-font-master/TTF (Japanese)/Kosefont-JP.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://assets/fonts/kose-font-master/TTF (Simplified Chinese)/XiaolaiSC-Regular.ttf" type="DynamicFontData" id=6]

[resource]
size = 21
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 2 )
fallback/1 = ExtResource( 5 )
fallback/2 = ExtResource( 6 )
fallback/3 = ExtResource( 4 )
fallback/4 = ExtResource( 3 )
17 changes: 17 additions & 0 deletions godot/assets/fonts/DefaultFont38.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[gd_resource type="DynamicFont" load_steps=7 format=2]

[ext_resource path="res://assets/fonts/Pixel-Powerline-440555/Pixel Powerline.otf" type="DynamicFontData" id=1]
[ext_resource path="res://assets/fonts/Red-Hat-Text/redhattext/RedHatText-Bold.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://assets/fonts/LINE_Seed_JP/Desktop/OTF/LINESeedJP_OTF_Bd.otf" type="DynamicFontData" id=3]
[ext_resource path="res://assets/fonts/NaverNanumSquareNeo/OTF/NanumSquareNeoOTF-cBd.otf" type="DynamicFontData" id=4]
[ext_resource path="res://assets/fonts/kose-font-master/TTF (Japanese)/Kosefont-JP.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://assets/fonts/kose-font-master/TTF (Simplified Chinese)/XiaolaiSC-Regular.ttf" type="DynamicFontData" id=6]

[resource]
size = 38
font_data = ExtResource( 1 )
fallback/0 = ExtResource( 2 )
fallback/1 = ExtResource( 5 )
fallback/2 = ExtResource( 6 )
fallback/3 = ExtResource( 4 )
fallback/4 = ExtResource( 3 )
9 changes: 2 additions & 7 deletions godot/combat/interface/pause/PauseMode.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[ext_resource path="res://assets/UI/pause-window.png" type="Texture" id=3]
[ext_resource path="res://interface/themes/olympic_theme.tres" type="Theme" id=4]
[ext_resource path="res://combat/interface/pause/Buttons.gd" type="Script" id=5]
[ext_resource path="res://assets/fonts/DefaultFont18.tres" type="DynamicFont" id=6]
[ext_resource path="res://assets/UI/pause-window-map.png" type="Texture" id=8]
[ext_resource path="res://assets/fonts/Commando/commando.ttf" type="DynamicFontData" id=9]

Expand All @@ -21,12 +22,6 @@ extra_spacing_char = 1
extra_spacing_space = 1
font_data = ExtResource( 9 )

[sub_resource type="DynamicFont" id=3]
size = 18
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
font_data = ExtResource( 1 )

[node name="Pause" type="Control"]
pause_mode = 2
anchor_right = 1.0
Expand Down Expand Up @@ -112,7 +107,7 @@ margin_bottom = 79.0
size_flags_horizontal = 3
custom_constants/shadow_offset_x = 0
custom_constants/shadow_offset_y = 0
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 6 )
text = "find the x and do the y"
align = 1
valign = 1
Expand Down
23 changes: 5 additions & 18 deletions godot/map_with_sets/DescriptionMode.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[gd_scene load_steps=22 format=2]
[gd_scene load_steps=21 format=2]

[ext_resource path="res://combat/modes/Deathmatch.tres" type="Resource" id=1]
[ext_resource path="res://interface/themes/olympic_theme.tres" type="Theme" id=2]
[ext_resource path="res://assets/fonts/Commando/commando.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://assets/fonts/DefaultFont26.tres" type="DynamicFont" id=4]
[ext_resource path="res://assets/animations/Blink.tres" type="Animation" id=5]
[ext_resource path="res://ui/Typewriter.tscn" type="PackedScene" id=6]
[ext_resource path="res://assets/audio/UI_effects/thud.ogg" type="AudioStream" id=7]
[ext_resource path="res://map_with_sets/DescriptionMode.gd" type="Script" id=8]
[ext_resource path="res://ui/common_elements/PlayersReady/PlayersReady.tscn" type="PackedScene" id=9]
[ext_resource path="res://assets/fonts/Pixel-Powerline-440555/Pixel Powerline.otf" type="DynamicFontData" id=10]
[ext_resource path="res://assets/fonts/DefaultFont38.tres" type="DynamicFont" id=10]

[sub_resource type="DynamicFont" id=1]
size = 125
Expand Down Expand Up @@ -85,19 +86,6 @@ tracks/0/keys = {
"values": [ true ]
}

[sub_resource type="DynamicFont" id=7]
size = 26
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
font_data = ExtResource( 10 )

[sub_resource type="DynamicFont" id=12]
size = 38
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
extra_spacing_char = 1
font_data = ExtResource( 10 )

[node name="DescriptionMode" type="Control"]
pause_mode = 2
anchor_right = 1.0
Expand Down Expand Up @@ -227,7 +215,6 @@ mix_target = 1
bus = "SFX"

[node name="Continue" type="Label" parent="."]
modulate = Color( 1, 1, 1, 0 )
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
Expand All @@ -238,7 +225,7 @@ margin_right = 639.998
margin_bottom = 393.522
custom_constants/shadow_offset_x = 0
custom_constants/shadow_offset_y = 0
custom_fonts/font = SubResource( 7 )
custom_fonts/font = ExtResource( 4 )
text = "hold the BUTTON to continue"
align = 1
valign = 1
Expand All @@ -258,7 +245,7 @@ margin_bottom = 219.0
custom_colors/font_color_shadow = Color( 0.2, 0.317647, 0.482353, 1 )
custom_constants/shadow_offset_x = 0
custom_constants/shadow_offset_y = 2
custom_fonts/font = SubResource( 12 )
custom_fonts/font = ExtResource( 10 )

[node name="LineLeft" type="Polygon2D" parent="."]
self_modulate = Color( 1.12, 1.12, 1.12, 1 )
Expand Down
5 changes: 3 additions & 2 deletions godot/selection/PlayerSelection.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=29 format=2]
[gd_scene load_steps=30 format=2]

[ext_resource path="res://selection/PlayerSelection.gd" type="Script" id=1]
[ext_resource path="res://selection/SpeciesChoice.gd" type="Script" id=2]
Expand All @@ -19,6 +19,7 @@
[ext_resource path="res://selection/interface/SelectArrow.tscn" type="PackedScene" id=17]
[ext_resource path="res://assets/fonts/04b_19.ttf" type="DynamicFontData" id=18]
[ext_resource path="res://assets/fonts/DefaultFont10.tres" type="DynamicFont" id=19]
[ext_resource path="res://assets/fonts/DefaultFont18.tres" type="DynamicFont" id=20]

[sub_resource type="Animation" id=1]
resource_name = "appear"
Expand Down Expand Up @@ -414,7 +415,7 @@ margin_top = 541.0
margin_right = 166.0
margin_bottom = 606.0
custom_colors/font_outline_modulate = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 8 )
custom_fonts/font = ExtResource( 20 )
text = "PRESS
TO JOIN!"
align = 1
Expand Down
9 changes: 2 additions & 7 deletions godot/selection/SelectionScreen.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
[ext_resource path="res://assets/fonts/bungee/BungeeLayers-Regular.otf" type="DynamicFontData" id=7]
[ext_resource path="res://special_scenes/combat_UI/session_points/Star.tscn" type="PackedScene" id=8]
[ext_resource path="res://assets/fonts/Pixel-Powerline-440555/Pixel Powerline.otf" type="DynamicFontData" id=9]
[ext_resource path="res://assets/fonts/DefaultFont40.tres" type="DynamicFont" id=10]

[sub_resource type="DynamicFont" id=1]
size = 24
Expand Down Expand Up @@ -93,12 +94,6 @@ outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
font_data = ExtResource( 7 )

[sub_resource type="DynamicFont" id=6]
size = 40
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
font_data = ExtResource( 9 )

[sub_resource type="DynamicFont" id=7]
size = 28
outline_size = 4
Expand Down Expand Up @@ -360,7 +355,7 @@ margin_left = -650.0
margin_top = 260.0
margin_right = 630.0
margin_bottom = 310.0
custom_fonts/font = SubResource( 6 )
custom_fonts/font = ExtResource( 10 )
text = "PRESS A BUTTON TO CONTINUE"
align = 1
valign = 1
Expand Down
5 changes: 3 additions & 2 deletions godot/special_scenes/combat_UI/gameover/HallOfFame.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]

[ext_resource path="res://special_scenes/combat_UI/gameover/WinnerBanner.tscn" type="PackedScene" id=1]
[ext_resource path="res://special_scenes/combat_UI/gameover/HallOfFame.gd" type="Script" id=2]
[ext_resource path="res://assets/fonts/Pixel-Powerline-440555/Pixel Powerline.otf" type="DynamicFontData" id=3]
[ext_resource path="res://combat/levels/background/menus.png" type="Texture" id=4]
[ext_resource path="res://assets/fonts/DefaultFont21.tres" type="DynamicFont" id=5]
[ext_resource path="res://interface/themes/olympic_theme.tres" type="Theme" id=9]

[sub_resource type="DynamicFont" id=3]
Expand Down Expand Up @@ -64,7 +65,7 @@ theme = ExtResource( 9 )
custom_colors/font_color_shadow = Color( 0.2, 0.317647, 0.482353, 1 )
custom_constants/shadow_offset_x = 0
custom_constants/shadow_offset_y = 3
custom_fonts/font = SubResource( 4 )
custom_fonts/font = ExtResource( 5 )
text = "PRESS A BUTTON TO CONTINUE"
align = 1
valign = 1
Expand Down
15 changes: 3 additions & 12 deletions godot/ui/Typewriter.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=3 format=2]

[ext_resource path="res://assets/fonts/bungee/BungeeLayers-Regular.otf" type="DynamicFontData" id=1]
[ext_resource path="res://assets/fonts/DefaultFont40.tres" type="DynamicFont" id=1]
[ext_resource path="res://ui/Typewriter.gd" type="Script" id=2]

[sub_resource type="DynamicFont" id=1]
size = 40
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
font_data = ExtResource( 1 )

[node name="Typewriter" type="Label"]
anchor_left = 0.5
anchor_top = 0.5
Expand All @@ -19,13 +13,10 @@ margin_top = 100.0
margin_right = 640.0
margin_bottom = 243.0
size_flags_horizontal = 3
custom_fonts/font = SubResource( 1 )
custom_fonts/font = ExtResource( 1 )
align = 1
valign = 1
uppercase = true
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Tween" type="Tween" parent="."]