Merge branch 'master' into 'movingWater'
# Conflicts: # ProjectSettings/ProjectVersion.txt
File added
Assets/Scripts/DoorScript.cs
0 → 100644
Assets/Scripts/KeyScript.cs
0 → 100644
Assets/Sprites.meta~HEAD
0 → 100644
Assets/scene.meta
0 → 100644
Assets/script.meta
0 → 100644
Assets/script/FloorSwitch.cs
0 → 100644
Assets/sprite.meta
0 → 100644
Please register or sign in to comment