From 4411ad2ade5d586f84636bc16449f72161d8a796 Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+antonwilc0x@users.noreply.github.com> Date: Fri, 4 Jan 2019 20:45:57 -0500 Subject: [PATCH 1/4] Patch 010409.1 (#2) --- project/ClassicClothes.tscn | 37 +++++++++++++++++++------------------ project/GameScreen.tscn | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/project/ClassicClothes.tscn b/project/ClassicClothes.tscn index 54b53af..df40f63 100644 --- a/project/ClassicClothes.tscn +++ b/project/ClassicClothes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://assets/briefs_classic.png" type="Texture" id=1] [ext_resource path="res://src/ItemDrag.gd" type="Script" id=2] @@ -9,14 +9,15 @@ [ext_resource path="res://assets/blue_camo_jeans.png" type="Texture" id=7] [ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=8] [ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=9] -[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=10] -[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=11] -[ext_resource path="res://assets/z_shirt.png" type="Texture" id=12] -[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=13] -[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=14] -[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=15] -[ext_resource path="res://assets/camera.png" type="Texture" id=16] -[ext_resource path="res://assets/owo_censor_classic.png" type="Texture" id=17] +[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=10] +[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=11] +[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=12] +[ext_resource path="res://assets/z_shirt.png" type="Texture" id=13] +[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=14] +[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=15] +[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=16] +[ext_resource path="res://assets/camera.png" type="Texture" id=17] +[ext_resource path="res://assets/owo_censor_classic.png" type="Texture" id=18] [node name="Clothes" type="Node"] @@ -263,7 +264,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 9 ) +texture_normal = ExtResource( 10 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -288,7 +289,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 10 ) +texture_normal = ExtResource( 11 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -313,7 +314,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 12 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -338,7 +339,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 12 ) +texture_normal = ExtResource( 13 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -363,7 +364,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 13 ) +texture_normal = ExtResource( 14 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -388,7 +389,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 15 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -413,7 +414,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 16 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -440,7 +441,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 17 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -465,7 +466,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 17 ) +texture_normal = ExtResource( 18 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] diff --git a/project/GameScreen.tscn b/project/GameScreen.tscn index 4d6e536..ac93505 100644 --- a/project/GameScreen.tscn +++ b/project/GameScreen.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] [ext_resource path="res://Interface.tscn" type="PackedScene" id=6] -[node name="GameScreen" type="Node"] +[node name="GameScreen" type="Node" index="0"] script = ExtResource( 1 ) From bca7eff89ec414b07a637315cd4ee7bec193d1ac Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+tomiscw@users.noreply.github.com> Date: Sun, 6 Jan 2019 12:50:48 -0500 Subject: [PATCH 2/4] p010619 merge conflict fix This is a possible merge conflict fix for the incoming 010619 patch. --- project/ClassicClothes.tscn | 112 ++++++++++++-------- project/{GameScreen.tscn => ModernScn.tscn} | 0 2 files changed, 70 insertions(+), 42 deletions(-) rename project/{GameScreen.tscn => ModernScn.tscn} (100%) diff --git a/project/ClassicClothes.tscn b/project/ClassicClothes.tscn index df40f63..e8c56d7 100644 --- a/project/ClassicClothes.tscn +++ b/project/ClassicClothes.tscn @@ -1,25 +1,26 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] -[ext_resource path="res://assets/briefs_classic.png" type="Texture" id=1] +[ext_resource path="res://assets/classic/briefs_classic.png" type="Texture" id=1] [ext_resource path="res://src/ItemDrag.gd" type="Script" id=2] -[ext_resource path="res://assets/zbriefs_classic.png" type="Texture" id=3] -[ext_resource path="res://assets/jeans.png" type="Texture" id=4] -[ext_resource path="res://assets/dj_shorts.png" type="Texture" id=5] -[ext_resource path="res://assets/sweat_pants.png" type="Texture" id=6] -[ext_resource path="res://assets/blue_camo_jeans.png" type="Texture" id=7] -[ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=8] -[ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=9] -[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=10] -[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=11] -[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=12] -[ext_resource path="res://assets/z_shirt.png" type="Texture" id=13] -[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=14] -[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=15] -[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=16] -[ext_resource path="res://assets/camera.png" type="Texture" id=17] -[ext_resource path="res://assets/owo_censor_classic.png" type="Texture" id=18] +[ext_resource path="res://assets/classic/zbriefs_classic.png" type="Texture" id=3] +[ext_resource path="res://assets/classic/fundosi_classic.png" type="Texture" id=4] +[ext_resource path="res://assets/jeans.png" type="Texture" id=5] +[ext_resource path="res://assets/dj_shorts.png" type="Texture" id=6] +[ext_resource path="res://assets/sweat_pants.png" type="Texture" id=7] +[ext_resource path="res://assets/blue_camo_jeans.png" type="Texture" id=8] +[ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=9] +[ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=10] +[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=11] +[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=12] +[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=13] +[ext_resource path="res://assets/z_shirt.png" type="Texture" id=14] +[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=15] +[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=16] +[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=17] +[ext_resource path="res://assets/classic/camera_classic.png" type="Texture" id=18] +[ext_resource path="res://assets/classic/owo_censor_classic.png" type="Texture" id=19] -[node name="Clothes" type="Node"] +[node name="Clothes" type="Node" index="0"] [node name="Wordrobe" type="ReferenceRect" parent="." index="0"] @@ -46,10 +47,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 517.0 -margin_top = 462.0 -margin_right = 585.0 -margin_bottom = 496.0 +margin_left = 64.0 +margin_top = 397.0 +margin_right = 132.0 +margin_bottom = 431.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -70,10 +71,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 403.0 -margin_top = 463.0 -margin_right = 471.0 -margin_bottom = 497.0 +margin_left = 371.0 +margin_top = 460.0 +margin_right = 439.0 +margin_bottom = 494.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -89,6 +90,31 @@ texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] +[node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 508.0 +margin_top = 459.0 +margin_right = 576.0 +margin_bottom = 499.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( 4 ) +script = ExtResource( 2 ) +_sections_unfolded = [ "Textures" ] + [node name="Bottoms" type="Node" parent="Wordrobe" index="1"] [node name="Jeans" type="TextureButton" parent="Wordrobe/Bottoms" index="0"] @@ -112,7 +138,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 4 ) +texture_normal = ExtResource( 5 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -137,7 +163,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 5 ) +texture_normal = ExtResource( 6 ) script = ExtResource( 2 ) _sections_unfolded = [ "Anchor", "Textures" ] @@ -162,7 +188,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 6 ) +texture_normal = ExtResource( 7 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -187,7 +213,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 7 ) +texture_normal = ExtResource( 8 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -212,7 +238,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 8 ) +texture_normal = ExtResource( 9 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -239,7 +265,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 9 ) +texture_normal = ExtResource( 10 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -264,7 +290,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 10 ) +texture_normal = ExtResource( 11 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -289,7 +315,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 12 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -314,7 +340,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 12 ) +texture_normal = ExtResource( 13 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -339,7 +365,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 13 ) +texture_normal = ExtResource( 14 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -364,7 +390,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 15 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -389,7 +415,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 16 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -414,7 +440,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 17 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -441,7 +467,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 17 ) +texture_normal = ExtResource( 18 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -466,7 +492,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 18 ) +texture_normal = ExtResource( 19 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -474,6 +500,8 @@ _sections_unfolded = [ "Textures" ] [connection signal="gui_input" from="Wordrobe/Underwear/ZBriefs" to="Wordrobe/Underwear/ZBriefs" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Wordrobe/Underwear/Fundosi" to="Wordrobe/Underwear/Fundosi" method="_on_outfit_gui_input"] + [connection signal="gui_input" from="Wordrobe/Bottoms/Jeans" to="Wordrobe/Bottoms/Jeans" method="_on_outfit_gui_input"] [connection signal="gui_input" from="Wordrobe/Bottoms/DJ Shorts" to="Wordrobe/Bottoms/DJ Shorts" method="_on_outfit_gui_input"] diff --git a/project/GameScreen.tscn b/project/ModernScn.tscn similarity index 100% rename from project/GameScreen.tscn rename to project/ModernScn.tscn From c97451aac5bfb3d6916bacb3d9765be11df023d9 Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+tomiscw@users.noreply.github.com> Date: Sun, 6 Jan 2019 12:53:53 -0500 Subject: [PATCH 3/4] p010619 merge conflict fix 2 --- project/ModernScn.tscn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/ModernScn.tscn b/project/ModernScn.tscn index ac93505..e8ebed2 100644 --- a/project/ModernScn.tscn +++ b/project/ModernScn.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://assets/icrazy_frame.png" type="Texture" id=3] [ext_resource path="res://Zack.tscn" type="PackedScene" id=4] [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] -[ext_resource path="res://Interface.tscn" type="PackedScene" id=6] +[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6] [node name="GameScreen" type="Node" index="0"] @@ -31,6 +31,6 @@ __meta__ = { [node name="Clothes" parent="." index="3" instance=ExtResource( 5 )] -[node name="Interface" parent="." index="4" instance=ExtResource( 6 )] +[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] From 98d10c77c36150fc6ed4cc944eb3a26d1c7521e4 Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+tomiscw@users.noreply.github.com> Date: Sun, 6 Jan 2019 12:55:23 -0500 Subject: [PATCH 4/4] More merge conflict fixes for p010619 --- project/ModernScn.tscn | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/project/ModernScn.tscn b/project/ModernScn.tscn index e8ebed2..d10ecc4 100644 --- a/project/ModernScn.tscn +++ b/project/ModernScn.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://src/GameScreen.gd" type="Script" id=1] -[ext_resource path="res://assets/15_dress_up_bg.png" type="Texture" id=2] +[ext_resource path="res://src/GameScn.gd" type="Script" id=1] +[ext_resource path="res://assets/modern_dress_up_bg.png" type="Texture" id=2] [ext_resource path="res://assets/icrazy_frame.png" type="Texture" id=3] [ext_resource path="res://Zack.tscn" type="PackedScene" id=4] [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] [ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6] -[node name="GameScreen" type="Node" index="0"] +[node name="GameScreen" type="Node"] script = ExtResource( 1 ) @@ -31,6 +31,4 @@ __meta__ = { [node name="Clothes" parent="." index="3" instance=ExtResource( 5 )] -[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] - - +[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] \ No newline at end of file