diff --git a/.gitignore b/.gitignore index 56a6fed..6f8af1b 100644 --- a/.gitignore +++ b/.gitignore @@ -74,17 +74,6 @@ Plugins/**/Intermediate/* DerivedDataCache/* <<<<<<< HEAD -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md003.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md004.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md005.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md006.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md007.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md008.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md010.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md011.uasset -SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md012.uasset + ======= >>>>>>> 95f315ade3bf74f55a7ff178d6c65dfcb6ece4df diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset new file mode 100644 index 0000000..3dc0f1b --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md000.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1a75f90b98893334cfc4e3e64d96ec9ffca1ef105ff2e57db28ccae605ccc39 +size 59580 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset new file mode 100644 index 0000000..26777d1 --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f757c964490c182969b84e3e14bdb28588c78ef060bb4a901813f86a51b93d6 +size 37991 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset new file mode 100644 index 0000000..855739d --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d95904fe4d76075fd48926b54b471a4f5960e0c49c7dde9e5165a535bf176e2 +size 21757 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md003.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md003.uasset new file mode 100644 index 0000000..e71ac40 --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e65a028bd30bf57308c0052cf5ad2aba86b9407cbd1db4ff7656fc4ba7e8782e +size 81123 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md004.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md004.uasset new file mode 100644 index 0000000..9f8d272 --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d0ee86fb912fc21702b9734dc624a597fed5789b470229dbb70454c9655e17d +size 149958 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md005.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md005.uasset new file mode 100644 index 0000000..75966bc --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6e84ec2c0b881f3a04d17ed555ef0f6636fc95831189e234180ae949e8b1331 +size 280731 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md008.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md008.uasset new file mode 100644 index 0000000..043403e --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f43a26098c6b496a3dbed6869235f929a87dcdd671f570dd82d41d4a626da42 +size 9774222 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md010.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md010.uasset new file mode 100644 index 0000000..e33acec --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7179d5b2c50a62e04ff5a7a571d5c3592186f1586772ed376cf0f67715d2c703 +size 2404908 diff --git a/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md012.uasset b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md012.uasset new file mode 100644 index 0000000..e4658e5 --- /dev/null +++ b/SpaceStudioClient/Content/YYZ_demo/StaticMesh/SM_Archi02_SM_Md012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d017762a234a3f95081781418a8fc61e38c075d0c87ae454c44a739b3c37fdfb +size 16099