Removed unused assets

- Removed some unsued assets from the original second version
- Added window control from Project 64 and made it more customizable
- Added a Coming Soon and About window
- Redid the interface and removed the Sixam logo, for now

Clothes.tscn

@@ -26,8 +26,8 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 205.0
-margin_top = 24.0
+margin_top = 33.0
-margin_right = 758.0
+margin_right = 771.0
 margin_bottom = 527.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -61,7 +61,6 @@ shortcut = null
 group = null
 texture_normal = ExtResource( 1 )
 script = ExtResource( 2 )
-_sections_unfolded = [ "Textures" ]
 
 [node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear" index="1"]
 
@@ -96,10 +95,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 609.0
+margin_left = 628.0
-margin_top = 402.0
+margin_top = 399.0
-margin_right = 715.0
+margin_right = 734.0
-margin_bottom = 514.0
+margin_bottom = 511.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -325,10 +324,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 215.0
+margin_left = 209.0
-margin_top = 66.0
+margin_top = 52.0
-margin_right = 382.0
+margin_right = 376.0
-margin_bottom = 290.0
+margin_bottom = 276.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -350,10 +349,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 393.0
+margin_left = 398.0
-margin_top = 166.0
+margin_top = 172.0
-margin_right = 482.0
+margin_right = 487.0
-margin_bottom = 316.0
+margin_bottom = 322.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -377,10 +376,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 411.0
+margin_left = 419.0
-margin_top = 93.0
+margin_top = 97.0
-margin_right = 460.0
+margin_right = 468.0
-margin_bottom = 155.0
+margin_bottom = 159.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -403,9 +402,9 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 381.0
-margin_top = 37.0
+margin_top = 43.0
 margin_right = 486.0
-margin_bottom = 77.0
+margin_bottom = 83.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2

Interface.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=2 format=2]
 
 [ext_resource path="res://src/Interface.gd" type="Script" id=1]
-[ext_resource path="res://assets/sixam.png" type="Texture" id=2]
 
 [node name="Interface" type="Control"]
 
@@ -9,8 +8,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
+margin_top = -7.0
 margin_right = 40.0
-margin_bottom = 40.0
+margin_bottom = 33.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -25,54 +25,26 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 14.0
 margin_top = 7.0
-margin_right = 172.0
+margin_right = 799.0
-margin_bottom = 182.0
+margin_bottom = 35.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
-__meta__ = {
-"_edit_lock_": true
-}
 
-[node name="SixamBtn" type="TextureButton" parent="ReferenceRect" index="0"]
+[node name="HozContainer" type="HBoxContainer" parent="ReferenceRect" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
-anchor_right = 0.0
+anchor_right = 1.0
-anchor_bottom = 0.0
+anchor_bottom = 1.0
-margin_left = 40.0
+margin_left = 4.0
-margin_right = 440.0
+margin_top = 3.0
-margin_bottom = 400.0
+margin_right = -3.0
-rect_scale = Vector2( 0.18, 0.18 )
+margin_bottom = -3.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
-texture_normal = ExtResource( 2 )
-_sections_unfolded = [ "Rect", "Textures" ]
-
-[node name="HozContainer" type="VBoxContainer" parent="ReferenceRect" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
-margin_left = 12.0
-margin_top = 79.0
-margin_right = 147.0
-margin_bottom = 173.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
@@ -80,7 +52,6 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 alignment = 0
-_sections_unfolded = [ "Rect" ]
 
 [node name="AboutBtn" type="Button" parent="ReferenceRect/HozContainer" index="0"]
 
@@ -88,8 +59,8 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_right = 135.0
+margin_right = 50.0
-margin_bottom = 20.0
+margin_bottom = 22.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -111,9 +82,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 24.0
+margin_left = 54.0
-margin_right = 135.0
+margin_right = 137.0
-margin_bottom = 44.0
+margin_bottom = 22.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2

Window.tscn

@@ -3,10 +3,10 @@
 [ext_resource path="res://assets/dress up bg.png" type="Texture" id=1]
 [ext_resource path="res://assets/zack.png" type="Texture" id=2]
 [ext_resource path="res://Clothes.tscn" type="PackedScene" id=3]
-[ext_resource path="res://Interface.tscn" type="PackedScene" id=4]
+[ext_resource path="res://assets/lights.png" type="Texture" id=4]
-[ext_resource path="res://assets/lights.png" type="Texture" id=5]
+[ext_resource path="res://Interface.tscn" type="PackedScene" id=5]
 
-[node name="Window" type="Node2D"]
+[node name="Window" type="Node2D" index="0"]
 
 [node name="Background" type="Sprite" parent="." index="0"]
 
@@ -23,12 +23,12 @@ __meta__ = {
 
 [node name="Clothes" parent="." index="2" instance=ExtResource( 3 )]
 
-[node name="Interface" parent="." index="3" instance=ExtResource( 4 )]
+[node name="Lights" type="Sprite" parent="." index="3"]
-
-[node name="Lights" type="Sprite" parent="." index="4"]
 
 position = Vector2( 477.823, 100.811 )
-texture = ExtResource( 5 )
+texture = ExtResource( 4 )
 _sections_unfolded = [ "Z Index" ]
 
+[node name="Interface" parent="." index="4" instance=ExtResource( 5 )]
+
 

assets/biker jacket.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/biker jacket.png-0cf0bb90b603960a6aa7e8702d3c76b7.stex"
-
-[deps]
-
-source_file="res://assets/biker jacket.png"
-dest_files=[ "res://.import/biker jacket.png-0cf0bb90b603960a6aa7e8702d3c76b7.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-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
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/canons pants.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/canons pants.png-02586ae6a9b7492605485c3d8ac85cd3.stex"
-
-[deps]
-
-source_file="res://assets/canons pants.png"
-dest_files=[ "res://.import/canons pants.png-02586ae6a9b7492605485c3d8ac85cd3.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-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
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/ed's outfit.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/ed's outfit.png-0da3b8d4653d4ccde6e535fd3d70a0af.stex"
-
-[deps]
-
-source_file="res://assets/ed's outfit.png"
-dest_files=[ "res://.import/ed's outfit.png-0da3b8d4653d4ccde6e535fd3d70a0af.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-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
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/korm shirt.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/korm shirt.png-d9db72b65d257ab933419376b75efe3b.stex"
-
-[deps]
-
-source_file="res://assets/korm shirt.png"
-dest_files=[ "res://.import/korm shirt.png-d9db72b65d257ab933419376b75efe3b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-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
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

assets/wendys.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/wendys.png-a99641e71d5f2e8ef5e330b425c9f30b.stex"
-
-[deps]
-
-source_file="res://assets/wendys.png"
-dest_files=[ "res://.import/wendys.png-a99641e71d5f2e8ef5e330b425c9f30b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-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
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

src/Interface.gd

@@ -1,7 +1,12 @@
 extends Control
 
+onready var coming_soon_win = preload("res://windows/ComingSoon.tscn") 
+onready var about_win = preload("res://windows/About.tscn")
+
 func _on_ScreenshotBtn_pressed():
-	pass
+	var win_instance = coming_soon_win.instance()
+	add_child(win_instance)
 
 func _on_AboutBtn_pressed():
-	pass
+	var win_instance = about_win.instance()
+	add_child(win_instance)

src/WindowControl.gd

@@ -0,0 +1,33 @@
+extends Control
+
+export var toolbar_title = "New Window"
+export var content_text = ""
+export var panel_height = 216
+
+var drag_pos = null
+
+func _ready():
+	$WindowFrame/TitleBarFrame/TitleBar/TitleLbl.text = toolbar_title
+	$WindowFrame/ContentFrame/ContentTxt.text = content_text
+	$WindowFrame/ContentFrame/ContentPanel.rect_size = Vector2(350, panel_height)
+	$WindowFrame.rect_size = Vector2(351, 31 + panel_height)
+	update()
+	
+func _process(delta):
+	pass
+
+func _on_TitleBar_gui_input(ev):
+	if ev is InputEventMouseButton:
+		if ev.button_index == BUTTON_LEFT:
+			if ev.pressed:
+				drag_pos = get_global_mouse_position() - rect_position
+			else:
+				drag_pos = null
+		
+			
+	if ev is InputEventMouseMotion and drag_pos != null:
+		rect_position = get_global_mouse_position() - drag_pos
+
+func _on_CloseBtn_pressed():
+	hide()
+	queue_free()

widgets/WindowControl.tscn

@@ -0,0 +1,177 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://src/WindowControl.gd" type="Script" id=1]
+
+[node name="WindowControl" type="Control"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_right = 40.0
+margin_bottom = 40.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+script = ExtResource( 1 )
+toolbar_title = "New Window"
+content_text = ""
+panel_height = 216
+
+[node name="WindowFrame" type="ReferenceRect" parent="." index="0"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_right = 351.0
+margin_bottom = 247.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+_sections_unfolded = [ "Patch Margin", "Rect" ]
+
+[node name="ContentFrame" type="ReferenceRect" parent="WindowFrame" index="0"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 32.0
+margin_right = 350.0
+margin_bottom = 248.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+
+[node name="ContentPanel" type="Panel" parent="WindowFrame/ContentFrame" index="0"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+_sections_unfolded = [ "Rect" ]
+
+[node name="ContentTxt" type="RichTextLabel" parent="WindowFrame/ContentFrame" index="1"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 6.0
+margin_top = 5.0
+margin_right = 347.0
+margin_bottom = 208.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = true
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+bbcode_enabled = false
+bbcode_text = ""
+visible_characters = -1
+percent_visible = 1.0
+meta_underlined = true
+tab_size = 4
+text = "Content"
+scroll_active = true
+scroll_following = false
+selection_enabled = false
+override_selected_font_color = false
+
+[node name="TitleBarFrame" type="ReferenceRect" parent="WindowFrame" index="1"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_right = 350.0
+margin_bottom = 33.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+
+[node name="TitleBar" type="Panel" parent="WindowFrame/TitleBarFrame" index="0"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+
+[node name="CloseBtn" type="Button" parent="WindowFrame/TitleBarFrame/TitleBar" index="0"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 3.0
+margin_top = 3.0
+margin_right = 26.0
+margin_bottom = 26.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+focus_mode = 2
+mouse_filter = 0
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 1
+toggle_mode = false
+enabled_focus_mode = 2
+shortcut = null
+group = null
+text = "X"
+flat = false
+align = 1
+_sections_unfolded = [ "Rect" ]
+
+[node name="TitleLbl" type="Label" parent="WindowFrame/TitleBarFrame/TitleBar" index="1"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 1.0
+anchor_bottom = 0.0
+margin_left = 31.0
+margin_bottom = 31.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 2
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 4
+text = "Title Bar"
+align = 1
+valign = 1
+percent_visible = 1.0
+lines_skipped = 0
+max_lines_visible = -1
+
+[connection signal="gui_input" from="WindowFrame/TitleBarFrame/TitleBar" to="." method="_on_TitleBar_gui_input"]
+
+[connection signal="pressed" from="WindowFrame/TitleBarFrame/TitleBar/CloseBtn" to="." method="_on_CloseBtn_pressed"]
+
+

windows/About.tscn

@@ -0,0 +1,13 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://widgets/WindowControl.tscn" type="PackedScene" id=1]
+
+[node name="ComingSoon" type="Node" index="0"]
+
+[node name="WindowControl" parent="." index="0" instance=ExtResource( 1 )]
+
+toolbar_title = "About"
+content_text = "Zack's Dress Up is a port and remake of ZC's Dress Up. Both created by Anthony Wilcox."
+panel_height = 50
+
+

windows/ComingSoon.tscn

@@ -0,0 +1,13 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://widgets/WindowControl.tscn" type="PackedScene" id=1]
+
+[node name="ComingSoon" type="Node"]
+
+[node name="WindowControl" parent="." index="0" instance=ExtResource( 1 )]
+
+toolbar_title = "Coming Soon"
+content_text = "This feature has not been implemented yet."
+panel_height = 30
+
+