diff --git a/assets/fonts/Dokdo/Dokdo-Regular.ttf b/assets/fonts/Dokdo/Dokdo-Regular.ttf new file mode 100644 index 0000000..8249795 Binary files /dev/null and b/assets/fonts/Dokdo/Dokdo-Regular.ttf differ diff --git a/assets/fonts/Dokdo/Dokdo-Regular.ttf.import b/assets/fonts/Dokdo/Dokdo-Regular.ttf.import new file mode 100644 index 0000000..5eb3544 --- /dev/null +++ b/assets/fonts/Dokdo/Dokdo-Regular.ttf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://comihs66wounx" +path="res://.godot/imported/Dokdo-Regular.ttf-35686d8eb3881af645d50e9f0910bc9c.fontdata" + +[deps] + +source_file="res://assets/fonts/Dokdo/Dokdo-Regular.ttf" +dest_files=["res://.godot/imported/Dokdo-Regular.ttf-35686d8eb3881af645d50e9f0910bc9c.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +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=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/assets/fonts/Dokdo/OFL.txt b/assets/fonts/Dokdo/OFL.txt new file mode 100644 index 0000000..6f7b22e --- /dev/null +++ b/assets/fonts/Dokdo/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2005-2017 FONTRIX. All Rights Reserved. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/Geo/Geo-Italic.ttf b/assets/fonts/Geo/Geo-Italic.ttf new file mode 100644 index 0000000..c40b1d0 Binary files /dev/null and b/assets/fonts/Geo/Geo-Italic.ttf differ diff --git a/assets/fonts/Geo/Geo-Italic.ttf.import b/assets/fonts/Geo/Geo-Italic.ttf.import new file mode 100644 index 0000000..fb8d294 --- /dev/null +++ b/assets/fonts/Geo/Geo-Italic.ttf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://b6gxwgomstkgu" +path="res://.godot/imported/Geo-Italic.ttf-fff5102e64e08d3e98dbbd3b01b471cc.fontdata" + +[deps] + +source_file="res://assets/fonts/Geo/Geo-Italic.ttf" +dest_files=["res://.godot/imported/Geo-Italic.ttf-fff5102e64e08d3e98dbbd3b01b471cc.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={} diff --git a/assets/fonts/Geo/Geo-Regular.ttf b/assets/fonts/Geo/Geo-Regular.ttf new file mode 100644 index 0000000..cd20bb3 Binary files /dev/null and b/assets/fonts/Geo/Geo-Regular.ttf differ diff --git a/assets/fonts/Geo/Geo-Regular.ttf.import b/assets/fonts/Geo/Geo-Regular.ttf.import new file mode 100644 index 0000000..98a151a --- /dev/null +++ b/assets/fonts/Geo/Geo-Regular.ttf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://s4c1kf0rk2mb" +path="res://.godot/imported/Geo-Regular.ttf-ea6aa4330b08d367c3a4134ebd69f7c6.fontdata" + +[deps] + +source_file="res://assets/fonts/Geo/Geo-Regular.ttf" +dest_files=["res://.godot/imported/Geo-Regular.ttf-ea6aa4330b08d367c3a4134ebd69f7c6.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={} diff --git a/assets/fonts/Geo/OFL.txt b/assets/fonts/Geo/OFL.txt new file mode 100644 index 0000000..ad13710 --- /dev/null +++ b/assets/fonts/Geo/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2000-2010, Ben Weiner (ben@readingtype.org.uk), +with Reserved Font Name Geo. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/Racing_Sans_One/OFL.txt b/assets/fonts/Racing_Sans_One/OFL.txt new file mode 100644 index 0000000..595ffac --- /dev/null +++ b/assets/fonts/Racing_Sans_One/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2012, Pablo Impallari (www.impallari.com|impallari@gmail.com),Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), with Reserved Font Name Racing Sans. + + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf b/assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf new file mode 100644 index 0000000..64d5b75 Binary files /dev/null and b/assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf differ diff --git a/assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf.import b/assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf.import new file mode 100644 index 0000000..633c7f0 --- /dev/null +++ b/assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dsa0oh7c0h4pu" +path="res://.godot/imported/RacingSansOne-Regular.ttf-88441b5e68f4114d3d33323daa87ff86.fontdata" + +[deps] + +source_file="res://assets/fonts/Racing_Sans_One/RacingSansOne-Regular.ttf" +dest_files=["res://.godot/imported/RacingSansOne-Regular.ttf-88441b5e68f4114d3d33323daa87ff86.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +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=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/src/characters/gfolf_girl/gfolf_girl.tscn b/src/characters/gfolf_girl/gfolf_girl.tscn index 7093db8..2fe4d13 100644 --- a/src/characters/gfolf_girl/gfolf_girl.tscn +++ b/src/characters/gfolf_girl/gfolf_girl.tscn @@ -169,7 +169,7 @@ bones/23/scale = Vector3(1, 1, 1) visible = false [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="6"] -transform = Transform3D(-0.944824, 0.316851, -0.0831417, -0.325345, -0.937238, 0.12544, -0.0381779, 0.145568, 0.988612, -0.1687, 3.1755, 0.839478) +transform = Transform3D(-0.944824, 0.316851, -0.0831416, -0.326581, -0.930889, 0.163676, -0.0255346, 0.181798, 0.983005, -0.1687, 3.14336, 0.866657) bone_name = "Hand.R" bone_idx = 11 diff --git a/src/player/shot_setup/shot_setup.tscn b/src/player/shot_setup/shot_setup.tscn index 9c2cb18..a49b875 100644 --- a/src/player/shot_setup/shot_setup.tscn +++ b/src/player/shot_setup/shot_setup.tscn @@ -764,12 +764,9 @@ offset_bottom = 66.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) -theme_override_constants/shadow_offset_y = 4 -theme_override_constants/shadow_offset_x = 6 -theme_override_font_sizes/bold_italics_font_size = 168 +theme_type_variation = &"ShotFeedback" bbcode_enabled = true -text = "[center][wave][rainbow][i][b]WOAH NICE[/b][/i][/rainbow][/wave][/center]" +text = "[center][wave amp=64][rainbow]woah nice[/rainbow][/wave][/center]" fit_content = true autowrap_mode = 0 visible_characters_behavior = 1 @@ -797,12 +794,9 @@ grow_horizontal = 2 grow_vertical = 2 pivot_offset = Vector2(100, 115) mouse_filter = 2 -theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) -theme_override_constants/shadow_offset_y = 4 -theme_override_constants/shadow_offset_x = 6 -theme_override_font_sizes/bold_italics_font_size = 168 +theme_type_variation = &"ShotFeedback" bbcode_enabled = true -text = "[center][tornado radius=20][color=powder_blue][i][b]WASTED[/b][/i][/color][/tornado][/center]" +text = "[center][tornado radius=16][color=powder_blue]wasted[/color][/tornado][/center]" fit_content = true autowrap_mode = 0 visible_characters_behavior = 1 diff --git a/src/ui/main_theme.tres b/src/ui/main_theme.tres index 85f4213..83af6f5 100644 --- a/src/ui/main_theme.tres +++ b/src/ui/main_theme.tres @@ -1,15 +1,7 @@ [gd_resource type="Theme" load_steps=3 format=3 uid="uid://diodjft5u2cck"] -[sub_resource type="SystemFont" id="SystemFont_dpm3o"] -font_names = PackedStringArray("Sans-Serif") -font_italic = true -font_weight = 800 -generate_mipmaps = true - -[sub_resource type="SystemFont" id="SystemFont_2dr7l"] -font_names = PackedStringArray("Sans-Serif") -font_italic = true -font_weight = 800 +[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"] [resource] ClubSelectLabel/base_type = &"Label" @@ -20,11 +12,10 @@ ClubSelectLabel/constants/outline_size = 6 ClubSelectLabel/constants/shadow_offset_x = 6 ClubSelectLabel/constants/shadow_offset_y = 0 ClubSelectLabel/font_sizes/font_size = 84 -ClubSelectLabel/fonts/font = SubResource("SystemFont_dpm3o") -ShotFeedback/base_type = &"Label" -ShotFeedback/colors/font_color = Color(0.807843, 1, 1, 1) +ClubSelectLabel/fonts/font = ExtResource("1_3rv2b") +ShotFeedback/base_type = &"RichTextLabel" ShotFeedback/colors/font_shadow_color = Color(0, 0, 0, 1) -ShotFeedback/constants/shadow_offset_x = 3 -ShotFeedback/constants/shadow_offset_y = 2 -ShotFeedback/font_sizes/font_size = 96 -ShotFeedback/fonts/font = SubResource("SystemFont_2dr7l") +ShotFeedback/constants/shadow_offset_x = 6 +ShotFeedback/constants/shadow_offset_y = 4 +ShotFeedback/font_sizes/normal_font_size = 272 +ShotFeedback/fonts/normal_font = ExtResource("1_eha6a")