tonytins/dressupzack
1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-05-07 22:04:49 -04:00
Code Issues Releases Wiki Activity

p010619 merge conflict fix

Browse source 
This is a possible merge conflict fix for the incoming 010619 patch.
This commit is contained in:
Anthony Wilcox 2019-01-06 12:50:48 -05:00
parent 4411ad2ade
commit bca7eff89e
2 changed files with 70 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
project/ClassicClothes.tscn
View file

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

0
project/GameScreen.tscn → project/ModernScn.tscn
View file