From 11a8c56d1bc3e77080551d98f1b5f0c1fa1e132c Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Sun, 31 May 2020 02:13:56 -0400 Subject: [PATCH] Major GUI changes --- ...l.png-cc4decc7b9943cbf17f375e8d90306c0.md5 | 3 + ....png-cc4decc7b9943cbf17f375e8d90306c0.stex | Bin 0 -> 140 bytes client/Assets/Art/UI/panel.png | Bin 0 -> 108 bytes client/Assets/Art/UI/panel.png.import | 34 ++++++ client/Assets/Themes/credits_theme.tres | 55 +++++++++ client/Assets/Themes/main_theme.tres | 107 ++++++++++++++++++ client/Nodes/GUI.tscn | 41 ++----- client/Scenes/Credits.scn | Bin 641 -> 639 bytes client/Scenes/Title.scn | Bin 3417 -> 3196 bytes 9 files changed, 211 insertions(+), 29 deletions(-) create mode 100644 client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.md5 create mode 100644 client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.stex create mode 100644 client/Assets/Art/UI/panel.png create mode 100644 client/Assets/Art/UI/panel.png.import create mode 100644 client/Assets/Themes/credits_theme.tres create mode 100644 client/Assets/Themes/main_theme.tres diff --git a/client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.md5 b/client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.md5 new file mode 100644 index 0000000..438e8d8 --- /dev/null +++ b/client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.md5 @@ -0,0 +1,3 @@ +source_md5="8f26965afe0b4209670f48e30c0ac7d7" +dest_md5="5baf4f679ea1fa30b2a8de6c0cb4af9a" + diff --git a/client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.stex b/client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.stex new file mode 100644 index 0000000000000000000000000000000000000000..4493b3e6630c1456fbbf68870979788d79bd9192 GIT binary patch literal 140 zcmZ>F2@c_4U|;}YHXvqT5MXBnk_A8<;ODN;2_$&Aq_}`wUQZ8~ARrA^&H++XX*GtZ~VeVeANH31nry{j8(1G2Y Zf#K144$UUt>hnMy44$rjF6*2UngGGdAhrMi literal 0 HcmV?d00001 diff --git a/client/Assets/Art/UI/panel.png b/client/Assets/Art/UI/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..e0063ea9f675a3e104f35cdbff5ab8a4b3352aa0 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|)I41rLnNjq zn|NgWI^V#)VbA`0$@w{6u$wb5JUY*z+2mV&9;k!C)78&qol`;+ E0Aa2j;Q#;t literal 0 HcmV?d00001 diff --git a/client/Assets/Art/UI/panel.png.import b/client/Assets/Art/UI/panel.png.import new file mode 100644 index 0000000..310d973 --- /dev/null +++ b/client/Assets/Art/UI/panel.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Art/UI/panel.png" +dest_files=[ "res://.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=1 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/client/Assets/Themes/credits_theme.tres b/client/Assets/Themes/credits_theme.tres new file mode 100644 index 0000000..63e06ed --- /dev/null +++ b/client/Assets/Themes/credits_theme.tres @@ -0,0 +1,55 @@ +[gd_resource type="Theme" load_steps=11 format=2] + +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/marksman-v1/Marksman.ttf" type="DynamicFontData" id=1] + +[sub_resource type="StyleBoxEmpty" id=1] + +[sub_resource type="StyleBoxEmpty" id=2] + +[sub_resource type="StyleBoxEmpty" id=3] + +[sub_resource type="StyleBoxEmpty" id=4] + +[sub_resource type="StyleBoxEmpty" id=5] + +[sub_resource type="StyleBoxEmpty" id=6] + +[sub_resource type="StyleBoxLine" id=7] +color = Color( 0.203922, 0.760784, 0.819608, 0.54902 ) + +[sub_resource type="StyleBoxEmpty" id=8] + +[sub_resource type="DynamicFont" id=9] +size = 32 +outline_size = 1 +outline_color = Color( 0.243137, 0.858824, 0.815686, 0.498039 ) +font_data = ExtResource( 1 ) + +[resource] +default_font = SubResource( 9 ) +Button/colors/font_color = Color( 0.203922, 0.760784, 0.819608, 0.54902 ) +Button/colors/font_color_disabled = Color( 0.901961, 0.901961, 0.901961, 0.2 ) +Button/colors/font_color_hover = Color( 0.203922, 0.760784, 0.819608, 0.784314 ) +Button/colors/font_color_pressed = Color( 0.6, 0.835294, 0.858824, 0.784314 ) +Button/constants/hseparation = 16 +Button/fonts/font = null +Button/styles/ = SubResource( 1 ) +Button/styles/disabled = SubResource( 2 ) +Button/styles/focus = SubResource( 3 ) +Button/styles/hover = SubResource( 4 ) +Button/styles/normal = SubResource( 5 ) +Button/styles/pressed = SubResource( 6 ) +HBoxContainer/constants/separation = 64 +HSeparator/constants/separation = 4 +HSeparator/styles/separator = SubResource( 7 ) +Label/colors/font_color = Color( 0.203922, 0.760784, 0.819608, 0.54902 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +Label/colors/font_outline_modulate = Color( 0.243137, 0.858824, 0.815686, 0.498039 ) +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/icons/ = null +Label/styles/normal = null +Panel/styles/panel = SubResource( 8 ) diff --git a/client/Assets/Themes/main_theme.tres b/client/Assets/Themes/main_theme.tres new file mode 100644 index 0000000..79f5b5c --- /dev/null +++ b/client/Assets/Themes/main_theme.tres @@ -0,0 +1,107 @@ +[gd_resource type="Theme" load_steps=19 format=2] + +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/marksman-v1/Marksman.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://Assets/Art/UI/panel.png" type="Texture" id=2] +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/targets-v3.1/Targets.otf" type="DynamicFontData" id=3] +[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/zapper-v1.1/Zapper.otf" type="DynamicFontData" id=4] +[ext_resource path="res://Assets/Art/UI/button1.png" type="Texture" id=5] +[ext_resource path="res://Assets/Art/UI/button2.png" type="Texture" id=6] + +[sub_resource type="StyleBoxEmpty" id=1] + +[sub_resource type="StyleBoxEmpty" id=2] + +[sub_resource type="StyleBoxEmpty" id=3] + +[sub_resource type="StyleBoxEmpty" id=4] + +[sub_resource type="StyleBoxEmpty" id=5] + +[sub_resource type="StyleBoxEmpty" id=6] + +[sub_resource type="StyleBoxLine" id=7] +color = Color( 0.203922, 0.760784, 0.819608, 0.54902 ) + +[sub_resource type="StyleBoxTexture" id=8] +texture = ExtResource( 2 ) +region_rect = Rect2( 0, 0, 8, 8 ) +axis_stretch_horizontal = 2 +axis_stretch_vertical = 2 +modulate_color = Color( 1, 1, 1, 0.686275 ) + +[sub_resource type="DynamicFont" id=9] +outline_size = 1 +outline_color = Color( 0.313726, 0.627451, 0.85098, 0.176471 ) +font_data = ExtResource( 4 ) + +[sub_resource type="DynamicFont" id=10] +size = 32 +font_data = ExtResource( 3 ) + +[sub_resource type="StyleBoxTexture" id=11] +texture = ExtResource( 2 ) +region_rect = Rect2( 0, 0, 8, 8 ) +axis_stretch_horizontal = 2 +axis_stretch_vertical = 2 +modulate_color = Color( 1, 1, 1, 0.686275 ) + +[sub_resource type="DynamicFont" id=12] +size = 32 +outline_size = 2 +outline_color = Color( 0.313726, 0.627451, 0.85098, 0.176471 ) +font_data = ExtResource( 1 ) + +[resource] +default_font = SubResource( 12 ) +Button/colors/font_color = Color( 1, 1, 1, 1 ) +Button/colors/font_color_disabled = Color( 0.901961, 0.901961, 0.901961, 0.2 ) +Button/colors/font_color_hover = Color( 0.286275, 0.568627, 0.768627, 0.941176 ) +Button/colors/font_color_pressed = Color( 0.1813, 0.361375, 0.49, 0.686275 ) +Button/constants/hseparation = 16 +Button/fonts/font = null +Button/styles/ = SubResource( 1 ) +Button/styles/disabled = SubResource( 2 ) +Button/styles/focus = SubResource( 3 ) +Button/styles/hover = SubResource( 4 ) +Button/styles/normal = SubResource( 5 ) +Button/styles/pressed = SubResource( 6 ) +HBoxContainer/constants/separation = 64 +HSeparator/constants/separation = 4 +HSeparator/styles/separator = SubResource( 7 ) +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( 0.223529, 0.443137, 0.6, 0 ) +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/icons/ = null +Label/styles/normal = null +Panel/styles/panel = SubResource( 8 ) +RichTextLabel/colors/default_color = Color( 1, 1, 1, 1 ) +RichTextLabel/colors/font_color_selected = Color( 0.49, 0.49, 0.49, 1 ) +RichTextLabel/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +RichTextLabel/colors/selection_color = Color( 0.1, 0.1, 1, 0.8 ) +RichTextLabel/constants/line_separation = 1 +RichTextLabel/constants/shadow_as_outline = 0 +RichTextLabel/constants/shadow_offset_x = 1 +RichTextLabel/constants/shadow_offset_y = 1 +RichTextLabel/constants/table_hseparation = 3 +RichTextLabel/constants/table_vseparation = 3 +RichTextLabel/fonts/bold_font = null +RichTextLabel/fonts/bold_italics_font = null +RichTextLabel/fonts/italics_font = null +RichTextLabel/fonts/mono_font = null +RichTextLabel/fonts/normal_font = SubResource( 9 ) +RichTextLabel/styles/focus = null +RichTextLabel/styles/normal = null +WindowDialog/colors/title_color = Color( 0.980392, 0.960784, 0.960784, 1 ) +WindowDialog/constants/close_h_ofs = 18 +WindowDialog/constants/close_v_ofs = 18 +WindowDialog/constants/scaleborder_size = 4 +WindowDialog/constants/title_height = 20 +WindowDialog/fonts/title_font = SubResource( 10 ) +WindowDialog/icons/close = ExtResource( 6 ) +WindowDialog/icons/close_highlight = ExtResource( 5 ) +WindowDialog/styles/panel = SubResource( 11 ) diff --git a/client/Nodes/GUI.tscn b/client/Nodes/GUI.tscn index d4d002a..dac1307 100644 --- a/client/Nodes/GUI.tscn +++ b/client/Nodes/GUI.tscn @@ -1,24 +1,16 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=8 format=2] -[ext_resource path="res://Assets/Themes/default.tres" type="Theme" id=1] +[ext_resource path="res://Assets/Themes/main_theme.tres" type="Theme" id=1] [ext_resource path="res://Scripts/Systems/GameGui.gd" type="Script" id=2] [ext_resource path="res://Assets/Proprietary/hf-scifi-complete/improbable-v1/Improbable.ttf" type="DynamicFontData" id=3] -[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/zapper-v1.1/Zapper.otf" type="DynamicFontData" id=4] [ext_resource path="res://Assets/Proprietary/hf-scifi-complete/marksman-v1/Marksman.ttf" type="DynamicFontData" id=5] [ext_resource path="res://Scripts/Entities/Fader.gd" type="Script" id=6] [sub_resource type="DynamicFont" id=1] -size = 18 -font_data = ExtResource( 4 ) - -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 0.2, 0.376471, 0.368627, 0.694118 ) - -[sub_resource type="DynamicFont" id=3] size = 48 font_data = ExtResource( 3 ) -[sub_resource type="DynamicFont" id=4] +[sub_resource type="DynamicFont" id=2] size = 32 outline_size = 2 outline_color = Color( 0, 0, 0, 0.45098 ) @@ -28,7 +20,6 @@ font_data = ExtResource( 5 ) script = ExtResource( 2 ) [node name="Dialog" type="Control" parent="."] -visible = false anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 @@ -41,7 +32,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Textbox" type="ColorRect" parent="Dialog"] +[node name="Textbox" type="Panel" parent="Dialog"] anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 @@ -50,10 +41,6 @@ margin_left = -475.0 margin_top = -143.0 margin_right = 475.0 margin_bottom = -20.0 -color = Color( 0.254902, 0.513726, 0.505882, 0.870588 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Speaker" type="Label" parent="Dialog/Textbox"] margin_left = 12.0 @@ -65,16 +52,13 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Body" type="Label" parent="Dialog/Textbox"] -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 +[node name="Body" type="RichTextLabel" parent="Dialog/Textbox"] margin_left = 12.0 -margin_top = -16.5 -margin_right = -39.0 -margin_bottom = 49.5 -custom_fonts/font = SubResource( 1 ) -text = "Hello world!" +margin_top = 40.0 +margin_right = 933.0 +margin_bottom = 111.0 +text = "Hello world! ' & * $" +scroll_active = false __meta__ = { "_edit_use_anchors_": false } @@ -84,7 +68,6 @@ margin_left = 37.0 margin_top = -9.0 margin_right = 987.0 margin_bottom = 22.0 -custom_styles/panel = SubResource( 2 ) __meta__ = { "_edit_use_anchors_": false } @@ -122,7 +105,7 @@ margin_left = 12.0 margin_top = -59.0 margin_right = 1257.0 margin_bottom = -8.0 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 1 ) text = "Entering: Depths" valign = 2 __meta__ = { @@ -138,7 +121,7 @@ margin_left = -386.0 margin_top = -110.5 margin_right = 386.0 margin_bottom = 110.5 -custom_fonts/font = SubResource( 4 ) +custom_fonts/font = SubResource( 2 ) text = "Press WASD to move" align = 1 __meta__ = { diff --git a/client/Scenes/Credits.scn b/client/Scenes/Credits.scn index ffcc73fc4e179670923d8b2a48062e47c8f6fa08..8bfa67ff90455f033bd55c67635f6dc1537f3f07 100644 GIT binary patch literal 639 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 literal 3417 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