Merge branch 'main' of https://gitlab.msu.edu/startcat/mi-455-project-2 (f4c7384b) · Commits · startcat / MI 455 Project 3

Commit f4c7384b authored 1 year ago by Henry

Browse files

Merge branch 'main' of https://gitlab.msu.edu/startcat/mi-455-project-2

parents c681e33f 2dc1c194

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/camera_001.prefab 60 additions, 7 deletions

...sset Store Packs/Furniture_FREE/Prefabs/camera_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/coffee_machine_001.prefab 60 additions, 7 deletions

...re Packs/Furniture_FREE/Prefabs/coffee_machine_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/dish_001.prefab 60 additions, 7 deletions

.../Asset Store Packs/Furniture_FREE/Prefabs/dish_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/dish_002.prefab 60 additions, 7 deletions

.../Asset Store Packs/Furniture_FREE/Prefabs/dish_002.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/drink_001.prefab 60 additions, 7 deletions

...Asset Store Packs/Furniture_FREE/Prefabs/drink_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/drink_002.prefab 60 additions, 7 deletions

...Asset Store Packs/Furniture_FREE/Prefabs/drink_002.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/dumbbell_001.prefab 60 additions, 7 deletions

...et Store Packs/Furniture_FREE/Prefabs/dumbbell_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/dumbbell_002.prefab 60 additions, 7 deletions

...et Store Packs/Furniture_FREE/Prefabs/dumbbell_002.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/flower_001.prefab 60 additions, 7 deletions

...sset Store Packs/Furniture_FREE/Prefabs/flower_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/ketchup_001.prefab 60 additions, 7 deletions

...set Store Packs/Furniture_FREE/Prefabs/ketchup_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/kitchen_chair_001.prefab 24 additions, 0 deletions

...ore Packs/Furniture_FREE/Prefabs/kitchen_chair_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/lamp_001.prefab 60 additions, 7 deletions

.../Asset Store Packs/Furniture_FREE/Prefabs/lamp_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/lamp_002.prefab 504 additions, 12 deletions

.../Asset Store Packs/Furniture_FREE/Prefabs/lamp_002.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/lounge_chair_001.prefab 24 additions, 0 deletions

...tore Packs/Furniture_FREE/Prefabs/lounge_chair_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/microwave_oven_001.prefab 32 additions, 9 deletions

...re Packs/Furniture_FREE/Prefabs/microwave_oven_001.prefab
Assets/Art/Asset Store Packs/Furniture_FREE/Prefabs/scratching_post_001.prefab 24 additions, 0 deletions

...e Packs/Furniture_FREE/Prefabs/scratching_post_001.prefab
Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Prefabs/Calculator.prefab 73 additions, 1 deletion

...Office Supplies Low Poly/Assets/Prefabs/Calculator.prefab
Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Prefabs/Hole_punch.prefab 72 additions, 0 deletions

...Office Supplies Low Poly/Assets/Prefabs/Hole_punch.prefab
Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Prefabs/Legal_pad.prefab 72 additions, 0 deletions

.../Office Supplies Low Poly/Assets/Prefabs/Legal_pad.prefab
Assets/Art/Asset Store Packs/PolygonalMind/LowPolyOffice/Prefabs/Mesh_Wall_Corner.prefab 7 additions, 3 deletions

...lygonalMind/LowPolyOffice/Prefabs/Mesh_Wall_Corner.prefab

with 1492 additions and 102 deletions

Please register or to comment