From 285a4c2cce695985be31cdd36e85b3d708355148 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 3 Aug 2018 16:06:51 +0200 Subject: [PATCH] cleaned up repository, updated .gitignore --- .gitignore | 11 +++++++---- Assets/Editor.meta | 2 -- Assets/Plugins/Android/src/com/vuforia.meta | 9 --------- Assets/Plugins/iOS.meta | 9 --------- Assets/Plugins/x64.meta | 9 --------- Assets/Plugins/x86.meta | 9 --------- ProjectSettings/ProjectSettings.asset | 2 +- 7 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 Assets/Editor.meta delete mode 100644 Assets/Plugins/Android/src/com/vuforia.meta delete mode 100644 Assets/Plugins/iOS.meta delete mode 100644 Assets/Plugins/x64.meta delete mode 100644 Assets/Plugins/x86.meta diff --git a/.gitignore b/.gitignore index 985982e..970733e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,10 @@ obj/ ehthumbs.db Thumbs.db Output/ -/.vs/Unity3d/v15/Browse.VC.db -/.vs/Unity3d/v15/sqlite3/storage.ide -/.vs/Unity3d/v15/sqlite3/storage.ide-journal -/.vs/Unity3d/v15/Server/sqlite3/* +*.dtbcache +*.lock +*.ide +*.ide-journal +*.ide-shm +*.ide-wal +*.VC.db \ No newline at end of file diff --git a/Assets/Editor.meta b/Assets/Editor.meta deleted file mode 100644 index 96256fb..0000000 --- a/Assets/Editor.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 1 -guid: 1095d0f0ae0472046b1cc41cd3e05af5 diff --git a/Assets/Plugins/Android/src/com/vuforia.meta b/Assets/Plugins/Android/src/com/vuforia.meta deleted file mode 100644 index a016af8..0000000 --- a/Assets/Plugins/Android/src/com/vuforia.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: b9fbfeb63399a9d46877dafeae58dc9d -folderAsset: yes -timeCreated: 1492096646 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/iOS.meta b/Assets/Plugins/iOS.meta deleted file mode 100644 index 1387733..0000000 --- a/Assets/Plugins/iOS.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 165085d1db79b104fb36665e9562ed2b -folderAsset: yes -timeCreated: 1492096645 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/x64.meta b/Assets/Plugins/x64.meta deleted file mode 100644 index 35d5fce..0000000 --- a/Assets/Plugins/x64.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 8e791c9f4ed90ea418669f35136d29c0 -folderAsset: yes -timeCreated: 1492096645 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/x86.meta b/Assets/Plugins/x86.meta deleted file mode 100644 index 5e9a2f1..0000000 --- a/Assets/Plugins/x86.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 9ecad65547c38f44a8fafe1410cfabe5 -folderAsset: yes -timeCreated: 1492096646 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6459e6b..ef4ac51 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -570,7 +570,7 @@ PlayerSettings: webGLUseWasm: 0 webGLCompressionFormat: 1 scriptingDefineSymbols: - 1: + 1: TMP_PRESENT 4: VUFORIA_IOS_SETTINGS 7: TMP_PRESENT 14: VUFORIA_WSA_SETTINGS