Merge branch 'Meeting-Room-Increasing'

miniature-studios · Sep 6, 2023 · 490d674 · 490d674
2 parents bea5562 + 5c67372
commit 490d674
Show file tree

Hide file tree

Showing 34 changed files with 6,544 additions and 77 deletions.
diff --git a/...eModels/Inside/BigTiles/BossOffice.prefab → ...efabs/CoreModels/Inside/BossOffice.prefab b/...eModels/Inside/BigTiles/BossOffice.prefab → ...efabs/CoreModels/Inside/BossOffice.prefab
diff --git a/...ls/Inside/BigTiles/BossOffice.prefab.meta → .../CoreModels/Inside/BossOffice.prefab.meta b/...ls/Inside/BigTiles/BossOffice.prefab.meta → .../CoreModels/Inside/BossOffice.prefab.meta
diff --git a/...CoreModels/Inside/BigTiles/Kitchen.prefab → .../Prefabs/CoreModels/Inside/Kitchen.prefab b/...CoreModels/Inside/BigTiles/Kitchen.prefab → .../Prefabs/CoreModels/Inside/Kitchen.prefab
diff --git a/...odels/Inside/BigTiles/Kitchen.prefab.meta → ...abs/CoreModels/Inside/Kitchen.prefab.meta b/...odels/Inside/BigTiles/Kitchen.prefab.meta → ...abs/CoreModels/Inside/Kitchen.prefab.meta
diff --git a/...Models/Inside/BigTiles/MeetingRoom.prefab → ...fabs/CoreModels/Inside/MeetingRoom.prefab b/...Models/Inside/BigTiles/MeetingRoom.prefab → ...fabs/CoreModels/Inside/MeetingRoom.prefab
diff --git a/...s/Inside/BigTiles/MeetingRoom.prefab.meta → ...CoreModels/Inside/MeetingRoom.prefab.meta b/...s/Inside/BigTiles/MeetingRoom.prefab.meta → ...CoreModels/Inside/MeetingRoom.prefab.meta
diff --git a/...s/Prefabs/CoreModels/Inside/BigTiles.meta → JamGame/Assets/Prefabs/Tiles.meta b/...s/Prefabs/CoreModels/Inside/BigTiles.meta → JamGame/Assets/Prefabs/Tiles.meta
diff --git a/...ssets/Prefabs/Unions/Inside/BIgTiles.meta → ...ame/Assets/Prefabs/Tiles/MeetingRoom.meta b/...ssets/Prefabs/Unions/Inside/BIgTiles.meta → ...ame/Assets/Prefabs/Tiles/MeetingRoom.meta