tonytins/dressupzack
1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-12-19 13:14:43 -05: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
Download patch file Download diff file Expand all files Collapse all files

36
project/ModernScn.tscn Normal file
View file

@ -0,0 +1,36 @@
[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://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]
[node name="GameScreen" type="Node" index="0"]
script = ExtResource( 1 )
[node name="Background" type="Sprite" parent="." index="0"]
position = Vector2( 400, 277 )
texture = ExtResource( 2 )
__meta__ = {
"_edit_lock_": true
}
[node name="PicFrame" type="Sprite" parent="." index="1"]
position = Vector2( 93.9417, 121.396 )
texture = ExtResource( 3 )
__meta__ = {
"_edit_lock_": true
}
[node name="Zack" parent="." index="2" instance=ExtResource( 4 )]
[node name="Clothes" parent="." index="3" instance=ExtResource( 5 )]
[node name="Interface" parent="." index="4" instance=ExtResource( 6 )]