Merge branch 'development' into 'level2'
# Conflicts:
# colourful-love.userprefs
Showing
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/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