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

More merge conflict fixes for p010619

Browse source
This commit is contained in:
Anthony Wilcox 2019-01-06 12:55:23 -05:00
parent c97451aac5
commit 98d10c77c3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
project/ModernScn.tscn
View file

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