Merge branch 'map' into BS
# Conflicts: # Assets/Scripts.meta
Showing
Assets/Models.meta
0 → 100644
Assets/Models/Materials.meta
0 → 100644
Assets/Models/floor.fbx
0 → 100644
File added
Assets/Models/floor.fbx.meta
0 → 100644
Assets/Models/jackson.fbx
0 → 100644
File added
Assets/Models/texture.meta
0 → 100644
740 Bytes
1.19 KB
Assets/Models/wall.fbx
0 → 100644
File added
Assets/Models/wall.fbx.meta
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Assets/Prefabs.meta
0 → 100644
Assets/Prefabs/Map.meta
0 → 100644
Assets/Prefabs/Player.prefab
0 → 100644
This diff is collapsed.
This diff is collapsed.
File added
File added
Assets/Scripts/MapManager.cs
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.