From fbc7ad5c0f24c439a4d5739596ad419fddc22454 Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+tomiscw@users.noreply.github.com> Date: Sun, 30 Dec 2018 21:59:05 -0500 Subject: [PATCH] Window.tscn was renamed to MainScreen.tscn - New Credits window and it's respective button - Renamed panel_height to content_height - Window content text now supports BBCode - Made sure the content height doesn't exceed 216 pixels - GPL license notice now included in the about window - SixAM splash screen --- Clothes.tscn | 2 +- Interface.tscn | 26 ++++++++++++++++++++++++++ Window.tscn => MainScreen.tscn | 20 +++++++++++++------- Splash.tscn | 25 +++++++++++++++++++++++++ assets/sixam_splash.png | Bin 0 -> 11334 bytes assets/sixam_splash.png.import | 29 +++++++++++++++++++++++++++++ project.godot | 2 +- src/Interface.gd | 6 ++++++ src/Splash.gd | 4 ++++ src/WindowControl.gd | 25 ++++++++++++++++--------- widgets/WindowControl.tscn | 16 ++++++++++------ windows/About.tscn | 11 ++++++++--- windows/ComingSoon.tscn | 2 +- windows/Credits.tscn | 20 ++++++++++++++++++++ 14 files changed, 160 insertions(+), 28 deletions(-) rename Window.tscn => MainScreen.tscn (63%) create mode 100644 Splash.tscn create mode 100644 assets/sixam_splash.png create mode 100644 assets/sixam_splash.png.import create mode 100644 src/Splash.gd create mode 100644 windows/Credits.tscn diff --git a/Clothes.tscn b/Clothes.tscn index 8c3893d..814558d 100644 --- a/Clothes.tscn +++ b/Clothes.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://assets/camera.png" type="Texture" id=15] [ext_resource path="res://assets/owo censor.png" type="Texture" id=16] -[node name="Clothes" type="Node2D" index="0"] +[node name="Clothes" type="Node2D"] [node name="Wordrobe" type="ReferenceRect" parent="." index="0"] diff --git a/Interface.tscn b/Interface.tscn index 58cd316..3c89187 100644 --- a/Interface.tscn +++ b/Interface.tscn @@ -100,8 +100,34 @@ text = "Screenshot" flat = false align = 1 +[node name="CreditsBtn" type="Button" parent="ReferenceRect/HozContainer" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 141.0 +margin_right = 198.0 +margin_bottom = 22.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 = "Credits" +flat = false +align = 1 + [connection signal="pressed" from="ReferenceRect/HozContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] [connection signal="pressed" from="ReferenceRect/HozContainer/ScreenshotBtn" to="." method="_on_ScreenshotBtn_pressed"] +[connection signal="pressed" from="ReferenceRect/HozContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] + diff --git a/Window.tscn b/MainScreen.tscn similarity index 63% rename from Window.tscn rename to MainScreen.tscn index 011c29a..930b8ee 100644 --- a/Window.tscn +++ b/MainScreen.tscn @@ -2,16 +2,19 @@ [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://assets/lights.png" type="Texture" id=4] +[ext_resource path="res://assets/lights.png" type="Texture" id=3] +[ext_resource path="res://Clothes.tscn" type="PackedScene" id=4] [ext_resource path="res://Interface.tscn" type="PackedScene" id=5] -[node name="Window" type="Node2D" index="0"] +[node name="Window" type="Node2D"] [node name="Background" type="Sprite" parent="." index="0"] position = Vector2( 400, 277 ) texture = ExtResource( 1 ) +__meta__ = { +"_edit_lock_": true +} [node name="Zack" type="Sprite" parent="." index="1"] @@ -21,13 +24,16 @@ __meta__ = { "_edit_lock_": true } -[node name="Clothes" parent="." index="2" instance=ExtResource( 3 )] - -[node name="Lights" type="Sprite" parent="." index="3"] +[node name="Lights" type="Sprite" parent="." index="2"] position = Vector2( 477.823, 100.811 ) -texture = ExtResource( 4 ) +texture = ExtResource( 3 ) _sections_unfolded = [ "Z Index" ] +__meta__ = { +"_edit_lock_": true +} + +[node name="Clothes" parent="." index="3" instance=ExtResource( 4 )] [node name="Interface" parent="." index="4" instance=ExtResource( 5 )] diff --git a/Splash.tscn b/Splash.tscn new file mode 100644 index 0000000..8648dfa --- /dev/null +++ b/Splash.tscn @@ -0,0 +1,25 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://src/Splash.gd" type="Script" id=1] +[ext_resource path="res://assets/sixam_splash.png" type="Texture" id=2] + +[node name="Splash" type="Node" index="0"] + +script = ExtResource( 1 ) + +[node name="Sixam" type="Sprite" parent="." index="0"] + +position = Vector2( 399.784, 275.576 ) +texture = ExtResource( 2 ) +_sections_unfolded = [ "Offset" ] + +[node name="Timer" type="Timer" parent="." index="1"] + +process_mode = 1 +wait_time = 2.0 +one_shot = true +autostart = true + +[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] + + diff --git a/assets/sixam_splash.png b/assets/sixam_splash.png new file mode 100644 index 0000000000000000000000000000000000000000..8347279066c4a6fe292502b75a6635cdd7a6fd7a GIT binary patch literal 11334 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 literal 0 HcmV?d00001 diff --git a/assets/sixam_splash.png.import b/assets/sixam_splash.png.import new file mode 100644 index 0000000..b501733 --- /dev/null +++ b/assets/sixam_splash.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sixam_splash.png-c58f13964bb4f1a11257474ab2e19217.stex" + +[deps] + +source_file="res://assets/sixam_splash.png" +dest_files=[ "res://.import/sixam_splash.png-c58f13964bb4f1a11257474ab2e19217.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 diff --git a/project.godot b/project.godot index b2e8d74..2cff643 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=3 [application] config/name="Zack's Dress Up 1½" -run/main_scene="res://Window.tscn" +run/main_scene="res://Splash.tscn" config/icon="res://icon.png" [display] diff --git a/src/Interface.gd b/src/Interface.gd index c158083..3154b76 100644 --- a/src/Interface.gd +++ b/src/Interface.gd @@ -2,6 +2,7 @@ extends Control onready var coming_soon_win = preload("res://windows/ComingSoon.tscn") onready var about_win = preload("res://windows/About.tscn") +onready var credits_win = preload("res://windows/Credits.tscn") func _on_ScreenshotBtn_pressed(): var win_instance = coming_soon_win.instance() @@ -10,3 +11,8 @@ func _on_ScreenshotBtn_pressed(): func _on_AboutBtn_pressed(): var win_instance = about_win.instance() add_child(win_instance) + + +func _on_CreditsBtn_pressed(): + var win_instance = credits_win.instance() + add_child(win_instance) diff --git a/src/Splash.gd b/src/Splash.gd new file mode 100644 index 0000000..58088cc --- /dev/null +++ b/src/Splash.gd @@ -0,0 +1,4 @@ +extends Node + +func _on_Timer_timeout(): + get_tree().change_scene("res://MainScreen.tscn") diff --git a/src/WindowControl.gd b/src/WindowControl.gd index a83d471..0832e00 100644 --- a/src/WindowControl.gd +++ b/src/WindowControl.gd @@ -1,20 +1,27 @@ extends Control -export var toolbar_title = "New Window" +const DEFUALT_CONTENT_HEIGHT = 216 +const DEFUALT_PANEL_SIZE = Vector2(351, 216) + +export var toolbar_title = "" export var content_text = "" -export var panel_height = 216 +export var content_height = DEFUALT_CONTENT_HEIGHT 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() + if toolbar_title and content_text != "": + $WindowFrame/TitleBarFrame/TitleBar/TitleLbl.text = toolbar_title + $WindowFrame/ContentFrame/ContentTxt.bbcode_text = content_text -func _process(delta): - pass + if $WindowFrame/ContentFrame/ContentPanel.rect_size <= DEFUALT_PANEL_SIZE: + $WindowFrame/ContentFrame/ContentPanel.rect_size = Vector2(351, content_height) + $WindowFrame.rect_size = Vector2(351, 33 + content_height) + else: + $WindowFrame/ContentFrame/ContentPanel.rect_size = DEFUALT_PANEL_SIZE + + update() + func _on_TitleBar_gui_input(ev): if ev is InputEventMouseButton: diff --git a/widgets/WindowControl.tscn b/widgets/WindowControl.tscn index c003e0e..4050800 100644 --- a/widgets/WindowControl.tscn +++ b/widgets/WindowControl.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/WindowControl.gd" type="Script" id=1] -[node name="WindowControl" type="Control"] +[node name="WindowControl" type="Control" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -17,9 +17,9 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 script = ExtResource( 1 ) -toolbar_title = "New Window" +toolbar_title = "" content_text = "" -panel_height = 216 +content_height = 216 [node name="WindowFrame" type="ReferenceRect" parent="." index="0"] @@ -52,6 +52,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] [node name="ContentPanel" type="Panel" parent="WindowFrame/ContentFrame" index="0"] @@ -59,6 +60,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 +margin_right = 1.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -83,17 +85,18 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -bbcode_enabled = false +bbcode_enabled = true bbcode_text = "" visible_characters = -1 percent_visible = 1.0 meta_underlined = true tab_size = 4 -text = "Content" +text = "" scroll_active = true scroll_following = false selection_enabled = false override_selected_font_color = false +_sections_unfolded = [ "BBCode" ] [node name="TitleBarFrame" type="ReferenceRect" parent="WindowFrame" index="1"] @@ -101,7 +104,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 350.0 +margin_right = 351.0 margin_bottom = 33.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -109,6 +112,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +_sections_unfolded = [ "Rect" ] [node name="TitleBar" type="Panel" parent="WindowFrame/TitleBarFrame" index="0"] diff --git a/windows/About.tscn b/windows/About.tscn index 6fc5738..e2f5594 100644 --- a/windows/About.tscn +++ b/windows/About.tscn @@ -2,12 +2,17 @@ [ext_resource path="res://widgets/WindowControl.tscn" type="PackedScene" id=1] -[node name="ComingSoon" type="Node" index="0"] +[node name="About" type="Node"] [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 +content_text = "Zack's Dress Up is a port and remake of ZC's Dress Up. Both created by Anthony Wilcox. + +This is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. + +Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/" diff --git a/windows/ComingSoon.tscn b/windows/ComingSoon.tscn index 4882d5d..de9d9e2 100644 --- a/windows/ComingSoon.tscn +++ b/windows/ComingSoon.tscn @@ -8,6 +8,6 @@ toolbar_title = "Coming Soon" content_text = "This feature has not been implemented yet." -panel_height = 30 +content_height = 30 diff --git a/windows/Credits.tscn b/windows/Credits.tscn new file mode 100644 index 0000000..0b4d250 --- /dev/null +++ b/windows/Credits.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://widgets/WindowControl.tscn" type="PackedScene" id=1] + +[node name="Credits" type="Node"] + +[node name="WindowControl" parent="." index="0" instance=ExtResource( 1 )] + +toolbar_title = "Credits" +content_text = "[center]Created by Anthony Wilcox + +Clothing inspired by +Megawolf77 +Canon Rhode + +SixAM is a organization founded by Anthony Wilcox. +[/center]" +content_height = 217 + +