Merge pull request #12 from matryx/Develop

Develop
matryx · Aug 28, 2018 · e3ea821 · e3ea821
2 parents 706efae + 41f93cb
commit e3ea821
Show file tree

Hide file tree

Showing 80 changed files with 88,765 additions and 28,771 deletions.
diff --git a/.vs/Calcflow/v15/Server/sqlite3/storage.ide b/.vs/Calcflow/v15/Server/sqlite3/storage.ide
diff --git a/Assets/Avatars/CombinedAvatar.prefab b/Assets/Avatars/CombinedAvatar.prefab
@@ -11894,7 +11894,7 @@ MeshFilter:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1987799037361252}
-  m_Mesh: {fileID: 4300000, guid: 6a491929afe490c4c8dc388527be0796, type: 3}
+  m_Mesh: {fileID: 4300000, guid: c713775ce18cfbc4a9e47018546463a1, type: 3}
 --- !u!33 &33107550136337374
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -11992,7 +11992,7 @@ MeshFilter:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1920265100532038}
-  m_Mesh: {fileID: 4300000, guid: 6a491929afe490c4c8dc388527be0796, type: 3}
+  m_Mesh: {fileID: 4300000, guid: c713775ce18cfbc4a9e47018546463a1, type: 3}
 --- !u!33 &33269843516928208
 MeshFilter:
   m_ObjectHideFlags: 1