1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-05-08 06:14:48 -04:00

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
This commit is contained in:
Anthony Wilcox 2018-12-30 21:59:05 -05:00
parent e5db016ba1
commit fbc7ad5c0f
14 changed files with 160 additions and 28 deletions

View file

@ -17,7 +17,7 @@
[ext_resource path="res://assets/camera.png" type="Texture" id=15] [ext_resource path="res://assets/camera.png" type="Texture" id=15]
[ext_resource path="res://assets/owo censor.png" type="Texture" id=16] [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"] [node name="Wordrobe" type="ReferenceRect" parent="." index="0"]

View file

@ -100,8 +100,34 @@ text = "Screenshot"
flat = false flat = false
align = 1 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/AboutBtn" to="." method="_on_AboutBtn_pressed"]
[connection signal="pressed" from="ReferenceRect/HozContainer/ScreenshotBtn" to="." method="_on_ScreenshotBtn_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"]

View file

@ -2,16 +2,19 @@
[ext_resource path="res://assets/dress up bg.png" type="Texture" id=1] [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://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=3]
[ext_resource path="res://assets/lights.png" type="Texture" id=4] [ext_resource path="res://Clothes.tscn" type="PackedScene" id=4]
[ext_resource path="res://Interface.tscn" type="PackedScene" id=5] [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"] [node name="Background" type="Sprite" parent="." index="0"]
position = Vector2( 400, 277 ) position = Vector2( 400, 277 )
texture = ExtResource( 1 ) texture = ExtResource( 1 )
__meta__ = {
"_edit_lock_": true
}
[node name="Zack" type="Sprite" parent="." index="1"] [node name="Zack" type="Sprite" parent="." index="1"]
@ -21,13 +24,16 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="Clothes" parent="." index="2" instance=ExtResource( 3 )] [node name="Lights" type="Sprite" parent="." index="2"]
[node name="Lights" type="Sprite" parent="." index="3"]
position = Vector2( 477.823, 100.811 ) position = Vector2( 477.823, 100.811 )
texture = ExtResource( 4 ) texture = ExtResource( 3 )
_sections_unfolded = [ "Z Index" ] _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 )] [node name="Interface" parent="." index="4" instance=ExtResource( 5 )]

25
Splash.tscn Normal file
View file

@ -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"]

BIN
assets/sixam_splash.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View file

@ -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

View file

@ -11,7 +11,7 @@ config_version=3
[application] [application]
config/name="Zack's Dress Up 1½" config/name="Zack's Dress Up 1½"
run/main_scene="res://Window.tscn" run/main_scene="res://Splash.tscn"
config/icon="res://icon.png" config/icon="res://icon.png"
[display] [display]

View file

@ -2,6 +2,7 @@ extends Control
onready var coming_soon_win = preload("res://windows/ComingSoon.tscn") onready var coming_soon_win = preload("res://windows/ComingSoon.tscn")
onready var about_win = preload("res://windows/About.tscn") onready var about_win = preload("res://windows/About.tscn")
onready var credits_win = preload("res://windows/Credits.tscn")
func _on_ScreenshotBtn_pressed(): func _on_ScreenshotBtn_pressed():
var win_instance = coming_soon_win.instance() var win_instance = coming_soon_win.instance()
@ -10,3 +11,8 @@ func _on_ScreenshotBtn_pressed():
func _on_AboutBtn_pressed(): func _on_AboutBtn_pressed():
var win_instance = about_win.instance() var win_instance = about_win.instance()
add_child(win_instance) add_child(win_instance)
func _on_CreditsBtn_pressed():
var win_instance = credits_win.instance()
add_child(win_instance)

4
src/Splash.gd Normal file
View file

@ -0,0 +1,4 @@
extends Node
func _on_Timer_timeout():
get_tree().change_scene("res://MainScreen.tscn")

View file

@ -1,20 +1,27 @@
extends Control 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 content_text = ""
export var panel_height = 216 export var content_height = DEFUALT_CONTENT_HEIGHT
var drag_pos = null var drag_pos = null
func _ready(): func _ready():
$WindowFrame/TitleBarFrame/TitleBar/TitleLbl.text = toolbar_title if toolbar_title and content_text != "":
$WindowFrame/ContentFrame/ContentTxt.text = content_text $WindowFrame/TitleBarFrame/TitleBar/TitleLbl.text = toolbar_title
$WindowFrame/ContentFrame/ContentPanel.rect_size = Vector2(350, panel_height) $WindowFrame/ContentFrame/ContentTxt.bbcode_text = content_text
$WindowFrame.rect_size = Vector2(351, 31 + panel_height)
update()
func _process(delta): if $WindowFrame/ContentFrame/ContentPanel.rect_size <= DEFUALT_PANEL_SIZE:
pass $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): func _on_TitleBar_gui_input(ev):
if ev is InputEventMouseButton: if ev is InputEventMouseButton:

View file

@ -2,7 +2,7 @@
[ext_resource path="res://src/WindowControl.gd" type="Script" id=1] [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_left = 0.0
anchor_top = 0.0 anchor_top = 0.0
@ -17,9 +17,9 @@ mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
toolbar_title = "New Window" toolbar_title = ""
content_text = "" content_text = ""
panel_height = 216 content_height = 216
[node name="WindowFrame" type="ReferenceRect" parent="." index="0"] [node name="WindowFrame" type="ReferenceRect" parent="." index="0"]
@ -52,6 +52,7 @@ mouse_filter = 0
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
_sections_unfolded = [ "Rect" ]
[node name="ContentPanel" type="Panel" parent="WindowFrame/ContentFrame" index="0"] [node name="ContentPanel" type="Panel" parent="WindowFrame/ContentFrame" index="0"]
@ -59,6 +60,7 @@ anchor_left = 0.0
anchor_top = 0.0 anchor_top = 0.0
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_right = 1.0
rect_pivot_offset = Vector2( 0, 0 ) rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false rect_clip_content = false
mouse_filter = 0 mouse_filter = 0
@ -83,17 +85,18 @@ mouse_filter = 0
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
bbcode_enabled = false bbcode_enabled = true
bbcode_text = "" bbcode_text = ""
visible_characters = -1 visible_characters = -1
percent_visible = 1.0 percent_visible = 1.0
meta_underlined = true meta_underlined = true
tab_size = 4 tab_size = 4
text = "Content" text = ""
scroll_active = true scroll_active = true
scroll_following = false scroll_following = false
selection_enabled = false selection_enabled = false
override_selected_font_color = false override_selected_font_color = false
_sections_unfolded = [ "BBCode" ]
[node name="TitleBarFrame" type="ReferenceRect" parent="WindowFrame" index="1"] [node name="TitleBarFrame" type="ReferenceRect" parent="WindowFrame" index="1"]
@ -101,7 +104,7 @@ anchor_left = 0.0
anchor_top = 0.0 anchor_top = 0.0
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_right = 350.0 margin_right = 351.0
margin_bottom = 33.0 margin_bottom = 33.0
rect_pivot_offset = Vector2( 0, 0 ) rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false rect_clip_content = false
@ -109,6 +112,7 @@ mouse_filter = 0
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
_sections_unfolded = [ "Rect" ]
[node name="TitleBar" type="Panel" parent="WindowFrame/TitleBarFrame" index="0"] [node name="TitleBar" type="Panel" parent="WindowFrame/TitleBarFrame" index="0"]

View file

@ -2,12 +2,17 @@
[ext_resource path="res://widgets/WindowControl.tscn" type="PackedScene" id=1] [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 )] [node name="WindowControl" parent="." index="0" instance=ExtResource( 1 )]
toolbar_title = "About" toolbar_title = "About"
content_text = "Zack's Dress Up is a port and remake of ZC's Dress Up. Both created by Anthony Wilcox." content_text = "Zack's Dress Up is a port and remake of ZC's Dress Up. Both created by Anthony Wilcox.
panel_height = 50
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/"

View file

@ -8,6 +8,6 @@
toolbar_title = "Coming Soon" toolbar_title = "Coming Soon"
content_text = "This feature has not been implemented yet." content_text = "This feature has not been implemented yet."
panel_height = 30 content_height = 30

20
windows/Credits.tscn Normal file
View file

@ -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