diff --git a/Assets/Fonts/CJK/NotoSansCJKtc-Bold.otf b/Assets/Fonts/CJK/NotoSansCJKtc-Bold.otf new file mode 100644 index 000000000..7553dc5e7 Binary files /dev/null and b/Assets/Fonts/CJK/NotoSansCJKtc-Bold.otf differ diff --git a/Assets/Fonts/CJK/NotoSansCJKtc-Bold.tres b/Assets/Fonts/CJK/NotoSansCJKtc-Bold.tres new file mode 100644 index 000000000..45e47a96a --- /dev/null +++ b/Assets/Fonts/CJK/NotoSansCJKtc-Bold.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Assets/Fonts/CJK/NotoSansCJKtc-Bold.otf" type="DynamicFontData" id=1] + +[resource] +size = 12 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/Changelog.md b/Changelog.md index 8127e166a..d2f2320ec 100644 --- a/Changelog.md +++ b/Changelog.md @@ -28,9 +28,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Visual change, added border outlines to all window dialogs. - Animation now loops by default. - Onion skinning settings have been moved to a popup window, and 2 new buttons were added. One that enables it, and one that opens the settings window. +- The splash screen is no longer purple, it now gets affected by the chosen theme. ### Fixed -- Chinese characters not being rendered in notifications (the labels that appear when undoing/redoing) +- Chinese characters not being rendered in notifications (the labels that appear when undoing/redoing) and at the splash screen for Platinum & Gold Sponsor Placeholder labels - Fixed issue when moving frames, the current frame was being shown but the frame next to it was actually the one being drawn on. - Fixed issue with LineEdits not letting go of focus when the user clicked somewhere else - Thanks to Gaarco! (Issue #167) diff --git a/Prefabs/Dialogs/SplashDialog.tscn b/Prefabs/Dialogs/SplashDialog.tscn index 3202f0ebe..6afda10eb 100644 --- a/Prefabs/Dialogs/SplashDialog.tscn +++ b/Prefabs/Dialogs/SplashDialog.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://Scripts/Dialogs/SplashDialog.gd" type="Script" id=1] [ext_resource path="res://Assets/Graphics/Pixelorama Logo.png" type="Texture" id=2] @@ -8,40 +8,11 @@ [ext_resource path="res://Assets/Fonts/Roboto-Bold.tres" type="DynamicFont" id=6] [ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=7] -[sub_resource type="Theme" id=1] -Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) -Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) -Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) -Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) -Button/constants/hseparation = 2 -Button/fonts/font = null -Button/styles/disabled = null -Button/styles/focus = null -Button/styles/hover = null -Button/styles/normal = null -Button/styles/pressed = null -Label/colors/font_color = Color( 1, 1, 1, 1 ) -Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) -Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) -Label/constants/line_spacing = 3 -Label/constants/shadow_as_outline = 0 -Label/constants/shadow_offset_x = 1 -Label/constants/shadow_offset_y = 1 -Label/fonts/font = null -Label/styles/normal = null - -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 0.219608, 0.188235, 0.270588, 1 ) -border_width_top = 18 -border_color = Color( 0.4, 0.403922, 0.4, 1 ) -expand_margin_top = 18.0 - [node name="SplashDialog" type="WindowDialog"] +visible = true margin_right = 600.0 margin_bottom = 400.0 rect_min_size = Vector2( 600, 560 ) -theme = SubResource( 1 ) -custom_styles/panel = SubResource( 2 ) resizable = true script = ExtResource( 1 ) __meta__ = { @@ -166,8 +137,8 @@ margin_bottom = 260.0 rect_min_size = Vector2( 0, 260 ) [node name="Label" type="Label" parent="Contents/PatronsArtNews/ChangelogContainer/ChangelogScroll"] -margin_right = 142.0 -margin_bottom = 711.0 +margin_right = 130.0 +margin_bottom = 2921.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Added diff --git a/Scripts/Dialogs/SplashDialog.gd b/Scripts/Dialogs/SplashDialog.gd index 82d823ab7..37099130e 100644 --- a/Scripts/Dialogs/SplashDialog.gd +++ b/Scripts/Dialogs/SplashDialog.gd @@ -4,6 +4,8 @@ onready var changes_label : Label = $Contents/HBoxContainer/ChangesLabel onready var art_by_label : Label = $Contents/PatronsArtNews/ArtContainer/ArtCredits onready var show_on_startup_button : CheckBox = $Contents/BottomHboxContainer/ShowOnStartup onready var developed_by_label : Label = $Contents/BottomHboxContainer/VBoxContainer/DevelopedBy +onready var platinum_placeholder_label : Label = $Contents/Sponsors/PlatinumContainer/PlaceholderLabel +onready var gold_placeholder_label : Label = $Contents/Sponsors/GoldContainer/PlaceholderLabel func _on_SplashDialog_about_to_show() -> void: if Global.config_cache.has_section_key("preferences", "startup"): @@ -17,12 +19,16 @@ func _on_SplashDialog_about_to_show() -> void: if "zh" in TranslationServer.get_locale(): show_on_startup_button.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Small.tres")) developed_by_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Small.tres")) + platinum_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Bold.tres")) + gold_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Bold.tres")) else: show_on_startup_button.add_font_override("font", preload("res://Assets/Fonts/Roboto-Small.tres")) developed_by_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Small.tres")) + platinum_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Bold.tres")) + gold_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Bold.tres")) func _on_ArtCredits_pressed() -> void: - OS.shell_open("https://www.instagram.com/erevos_art") + OS.shell_open("https://www.instagram.com/erevoid") func _on_ShowOnStartup_toggled(pressed : bool) -> void: if pressed: