Major GUI changes

client/.import/panel.png-cc4decc7b9943cbf17f375e8d90306c0.md5

@@ -0,0 +1,3 @@
+source_md5="8f26965afe0b4209670f48e30c0ac7d7"
+dest_md5="5baf4f679ea1fa30b2a8de6c0cb4af9a"
+

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

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 )

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 )

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"]
+[node name="Body" type="RichTextLabel" parent="Dialog/Textbox"]
-anchor_top = 0.5
-anchor_right = 1.0
-anchor_bottom = 0.5
 margin_left = 12.0
-margin_top = -16.5
+margin_top = 40.0
-margin_right = -39.0
+margin_right = 933.0
-margin_bottom = 49.5
+margin_bottom = 111.0
-custom_fonts/font = SubResource( 1 )
+text = "Hello world! ' & * $"
-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__ = {