resolve conflict
Showing
No preview for this file type
Assembly-CSharp.csproj
0 → 100644
Assets/Background/33.jpg
deleted
100644 → 0
150 KB
Assets/Background/Untitled-2.png
0 → 100644
620 KB
Assets/Background/Untitled-4.png
0 → 100644
1.09 MB
Assets/Background/button.png
0 → 100644
15.8 KB
Assets/Background/button.png.meta
0 → 100644
Assets/Background/iniiii.jpg
deleted
100644 → 0
166 KB
Assets/Background/level.png
0 → 100644
125 KB
Assets/Background/level.png.meta
0 → 100644
Assets/Background/start.png
0 → 100644
49.6 KB
Assets/Background/start.png.meta
0 → 100644
Assets/Background/story.png
0 → 100644
1.86 MB
Assets/Background/story.png.meta
0 → 100644
Assets/Background/tombol.png
0 → 100644
53.7 KB
Assets/Background/tombol.png.meta
0 → 100644
Assets/Materials.meta
0 → 100644
Assets/Materials/Blue.mat
0 → 100644
Assets/Materials/Blue.mat.meta
0 → 100644
Assets/Materials/Green.mat
0 → 100644
Assets/Materials/Green.mat.meta
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Assets/Scenes/Stories.unity
0 → 100644
Assets/Scenes/Stories.unity.meta
0 → 100644
Assets/Scenes/Tutorials.unity
0 → 100644
Assets/Scenes/Tutorials.unity.meta
0 → 100644
Assets/Sound.meta
0 → 100644
File added
Assets/Sound/limbo.mp3
0 → 100644
File added
Assets/Sound/limbo.mp3.meta
0 → 100644
Assets/Sprites/Animations/player.controller
0 → 100644
61.2 KB
colourful-love.sln
0 → 100644
colourful-love.userprefs
0 → 100644
File added
obj/Debug/Assembly-CSharp.dll
0 → 100644
File added
obj/Debug/Assembly-CSharp.pdb
0 → 100644
File added