Skip to content

Commit

Permalink
conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
TinyTakinTeller committed Jan 5, 2025
2 parents 9f7c83d + 1b1ccb1 commit 8993d98
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 7 deletions.
Binary file added assets/font/noto_sans/ttf/noto_sans_sc_bold.ttf
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/font/noto_sans/ttf/noto_sans_sc_bold.ttf.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://bimsptf6fyjvd"
path="res://.godot/imported/noto_sans_sc_bold.ttf-69e59619cd26cf9a0a3569e7fbe53187.fontdata"

[deps]

source_file="res://assets/font/noto_sans/ttf/noto_sans_sc_bold.ttf"
dest_files=["res://.godot/imported/noto_sans_sc_bold.ttf-69e59619cd26cf9a0a3569e7fbe53187.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
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=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
2 changes: 1 addition & 1 deletion assets/font/noto_sans/woff/noto_sans.woff.import
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ hinting=1
subpixel_positioning=1
oversampling=0.0
Fallbacks=null
fallbacks=[Resource("res://assets/font/noto_sans/woff/noto_sans_sc_medium.woff")]
fallbacks=[Resource("res://assets/font/noto_sans/woff/noto_sans_sc_bold.woff")]
Compress=null
compress=true
preload=[]
Expand Down
Binary file added assets/font/noto_sans/woff/noto_sans_sc_bold.woff
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/font/noto_sans/woff/noto_sans_sc_bold.woff.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="font_data_dynamic"
type="FontFile"
uid="uid://djx2sm3i3imye"
path="res://.godot/imported/noto_sans_sc_bold.woff-278cc39bca5f43f398c6177801c548b5.fontdata"

[deps]

source_file="res://assets/font/noto_sans/woff/noto_sans_sc_bold.woff"
dest_files=["res://.godot/imported/noto_sans_sc_bold.woff-278cc39bca5f43f398c6177801c548b5.fontdata"]

[params]

Rendering=null
antialiasing=1
generate_mipmaps=false
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=[]
Compress=null
compress=true
preload=[]
language_support={}
script_support={}
opentype_features={}
7 changes: 7 additions & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ project/assembly_name="The Best Game Ever"

enabled=PackedStringArray("res://addons/BulletUpHell/plugin.cfg", "res://addons/format_on_save/plugin.cfg", "res://addons/gdLinter/plugin.cfg", "res://addons/label_font_auto_sizer/plugin.cfg", "res://addons/resources_spreadsheet_view/plugin.cfg")

[gui]

theme/custom_font="res://assets/font/noto_sans/woff/noto_sans.woff"
theme/default_font_generate_mipmaps=true

[input]

developer_console_toggle={
Expand All @@ -90,6 +95,8 @@ developer_console_clear_command={
swap_music_next={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":77,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":77,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":77,"unicode":0,"location":0,"echo":false,"script":null)
]
}
master_music_toggle={
Expand Down
4 changes: 3 additions & 1 deletion resources/theme/dark/dark.tres
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[gd_resource type="Theme" load_steps=83 format=4 uid="uid://d276arnrjws3i"]
[gd_resource type="Theme" load_steps=84 format=4 uid="uid://d276arnrjws3i"]

[ext_resource type="FontFile" uid="uid://q32pdsh1f0q8" path="res://assets/font/noto_sans/woff/noto_sans.woff" id="2_mxpaq"]
[ext_resource type="Texture2D" uid="uid://bvpjbal72ck7r" path="res://resources/theme/dark/icons.svg" id="2_plspm"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1ymaf"]
Expand Down Expand Up @@ -1479,6 +1480,7 @@ corner_radius_bottom_right = 2
corner_radius_bottom_left = 2

[resource]
default_font = ExtResource("2_mxpaq")
Button/colors/font_color = Color(1, 1, 1, 1)
Button/colors/font_color_disabled = Color(0.9, 0.9, 0.9, 0.2)
Button/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1)
Expand Down
5 changes: 4 additions & 1 deletion resources/theme/debug/debug.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[gd_resource type="Theme" load_steps=10 format=3 uid="uid://be30ymqku7twp"]
[gd_resource type="Theme" load_steps=11 format=3 uid="uid://be30ymqku7twp"]

[ext_resource type="FontFile" uid="uid://q32pdsh1f0q8" path="res://assets/font/noto_sans/woff/noto_sans.woff" id="1_f3vby"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ds5vx"]
content_margin_left = 4.0
Expand Down Expand Up @@ -125,6 +127,7 @@ bg_color = Color(1, 1, 1, 0.501961)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ncl5g"]

[resource]
default_font = ExtResource("1_f3vby")
Button/styles/disabled = SubResource("StyleBoxFlat_ds5vx")
Button/styles/focus = SubResource("StyleBoxFlat_20i00")
Button/styles/hover = SubResource("StyleBoxFlat_onb88")
Expand Down
3 changes: 2 additions & 1 deletion scenes/autostart/main/main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ layout_mode = 2
[node name="EventTracker" parent="CanvasLayer/MainControl/MainUI/MarginContainer/ScrollContainer/VBoxContainer/BodyMarginContainer/HBoxContainer" instance=ExtResource("4_cyhi7")]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 4
size_flags_horizontal = 1
size_flags_vertical = 1

[node name="ScreenMarginContainer" type="MarginContainer" parent="CanvasLayer/MainControl/MainUI/MarginContainer/ScrollContainer/VBoxContainer/BodyMarginContainer/HBoxContainer"]
layout_mode = 2
Expand Down
4 changes: 2 additions & 2 deletions scenes/ui/event_tracker/event_tracker.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
size_flags_horizontal = 0
size_flags_vertical = 0
script = ExtResource("1_ig3bo")
event_item_scene = ExtResource("1_sxvwh")

Expand Down
11 changes: 10 additions & 1 deletion scenes/ui/event_tracker/event_tracker_item/event_tracker_item.gd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func set_content(event_data: EventData, vals: Array, index: int, type_out: bool)
_event_data = event_data
_vals = vals
_index = index
_refresh_content()
_on_display_language_updated()
if type_out:
play_typing_animation()

Expand All @@ -38,3 +38,12 @@ func _connect_signals() -> void:

func _on_display_language_updated() -> void:
_refresh_content()
match TranslationServer.get_locale():
"en":
event_label.autowrap_mode = TextServer.AutowrapMode.AUTOWRAP_WORD
"fr":
event_label.autowrap_mode = TextServer.AutowrapMode.AUTOWRAP_WORD
"zh":
event_label.autowrap_mode = TextServer.AutowrapMode.AUTOWRAP_ARBITRARY
_:
event_label.autowrap_mode = TextServer.AutowrapMode.AUTOWRAP_WORD
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ size_flags_horizontal = 4
size_flags_vertical = 0
theme_override_font_sizes/font_size = 10
text = "[001]"
autowrap_mode = 1

[node name="EventLabel" parent="HBoxContainer" instance=ExtResource("2_h3nnf")]
unique_name_in_owner = true
custom_minimum_size = Vector2(190, 0)
layout_mode = 2
theme_override_font_sizes/font_size = 12
autowrap_mode = 1

0 comments on commit 8993d98

Please sign in to comment.