Merge branch 'main' into 33-trap-pitfall-art

2021-02-24 15:33:47 +00:00 · 2021-02-24 15:33:47 +00:00 · f2a9cf4229
parent cbb5825c20 9ef1d12a40
commit f2a9cf4229
4 changed files with 3 additions and 2595 deletions
--- a/game/.gitignore
+++ b/game/.gitignore
@ -89,3 +89,6 @@ config.txt
 # Generated dialogue files
 [Aa]ssets/Data/Dialogue/token*
 [Aa]ssets/Data/Dialogue/dialogue.data*
+
+# FMOD
+[Aa]ssets/Plugins/FMOD/Cache/
--- a/game/Assets/Plugins/FMOD/Cache/Editor.meta
+++ b/game/Assets/Plugins/FMOD/Cache/Editor.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 27b34f0051f845c458ad3a0129726e59
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
+++ b/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
--- a/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset.meta
+++ b/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c89ac03cd2d3f984e901aee227e1a9f9
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: