Merge pull request #69 from iamtomhewitt/develop

2.10.0-BETA
iamtomhewitt · Jan 2, 2020 · 0238ce3 · 0238ce3
2 parents 02a27e4 + 3bd0df0
commit 0238ce3
Show file tree

Hide file tree

Showing 711 changed files with 2,139 additions and 82,996 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+indent_style = tab
+indent_size = 4
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,9 @@ Logs/
 .vs/vr-pacman/DesignTimeBuild/
 /.vscode/settings.json
 /ProjectSettings/ProBuilderSettings.json
+/Assembly-CSharp.csproj
+/Assembly-CSharp-Editor.csproj
+Packages
+/Assets/config.json
+/Assets/config.json.meta
+/ProjectSettings/*.asset
diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/Animations/Controls/Accelerometer.anim b/Assets/Animations/Controls/Accelerometer.anim
diff --git a/Assets/Animations/Controls/Accelerometer.controller b/Assets/Animations/Controls/Accelerometer.controller
diff --git a/...Animations/Controls/Image.controller.meta → ...ns/Controls/Accelerometer.controller.meta b/...Animations/Controls/Image.controller.meta → ...ns/Controls/Accelerometer.controller.meta
diff --git a/Assets/Animations/Controls/Gyroscope.anim b/Assets/Animations/Controls/Gyroscope.anim
diff --git a/Assets/Animations/Controls/Gyroscope.anim.meta b/Assets/Animations/Controls/Gyroscope.anim.meta
diff --git a/Assets/Animations/Controls/Gyroscope.controller b/Assets/Animations/Controls/Gyroscope.controller
diff --git a/Assets/Animations/Controls/Gyroscope.controller.meta b/Assets/Animations/Controls/Gyroscope.controller.meta
diff --git a/Assets/Animations/Controls/Image.controller b/Assets/Animations/Controls/Image.controller
diff --git a/Assets/GoogleVR/Beta/Demos/Scenes.meta b/Assets/GoogleVR/Beta/Demos/Scenes.meta