Fix Git conflicts and add new egyptians assets

Okami115 · Mar 1, 2024 · 1376c7f · 1376c7f · Okami115 · Mar 3, 2024
1 parent bfd874d
commit 1376c7f
Show file tree

Hide file tree

Showing 49 changed files with 5,035 additions and 431 deletions.
diff --git a/Assets/ART/3d Assets/Egyptian Assets.meta b/Assets/ART/3d Assets/Egyptian Assets.meta
diff --git a/Assets/ART/3d Assets/Egyptian Assets/Ankh Infectada.fbx b/Assets/ART/3d Assets/Egyptian Assets/Ankh Infectada.fbx
diff --git a/Assets/ART/3d Assets/Egyptian Assets/Ankh Infectada.fbx.meta b/Assets/ART/3d Assets/Egyptian Assets/Ankh Infectada.fbx.meta
diff --git a/Assets/ART/3d Assets/Egyptian Assets/Ankh_Egipto.fbx b/Assets/ART/3d Assets/Egyptian Assets/Ankh_Egipto.fbx
diff --git a/Assets/ART/3d Assets/Egyptian Assets/Ankh_Egipto.fbx.meta b/Assets/ART/3d Assets/Egyptian Assets/Ankh_Egipto.fbx.meta
diff --git a/Assets/ART/3d Assets/Egyptian Assets/LVL_Egipto.fbx b/Assets/ART/3d Assets/Egyptian Assets/LVL_Egipto.fbx
diff --git a/Assets/ART/3d Assets/Egyptian Assets/LVL_Egipto.fbx.meta b/Assets/ART/3d Assets/Egyptian Assets/LVL_Egipto.fbx.meta
diff --git a/Assets/ART/3d Assets/Egyptian Assets/Obstaculo01_Egipto.fbx b/Assets/ART/3d Assets/Egyptian Assets/Obstaculo01_Egipto.fbx