Merge pull request #4 from icosa-foundation/feature/baseline-fixes

Baseline cleanup and reorg based on Icosa Open Blocks fork
icosa-foundation · Jun 28, 2024 · adb650e · adb650e
2 parents 29fa808 + 4bfd18b
commit adb650e
Show file tree

Hide file tree

Showing 6,039 changed files with 776,162 additions and 625,821 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+16d7589e89d835ed98f56228748dff86e6e46b84
+886f900ed7390e22ac6c8698eae06ad21d294309
diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,6 @@
 /unityProject.vrmanifest
 
 # m_DebugWebRequest creates this
-/Requests
+/Requests
+
+/Assets/TextMesh Pro*
diff --git a/client/unity/Assets/BlocksEnv.fbx → Assets/BlocksEnv.fbx b/client/unity/Assets/BlocksEnv.fbx → Assets/BlocksEnv.fbx
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		16d7589e89d835ed98f56228748dff86e6e46b84
		886f900ed7390e22ac6c8698eae06ad21d294309