Merge branch 'master' into ui_graphics

2023-07-09 17:17:29 +02:00
parent fa11bd0584 71a14c5bb6
commit 642aded8bd
20 changed files with 8096 additions and 2792 deletions
--- a/Assets/Sounds/asmadeus_typing_blip.wav
+++ b/Assets/Sounds/asmadeus_typing_blip.wav
--- a/Assets/Sounds/asmadeus_typing_blip.wav.meta
+++ b/Assets/Sounds/asmadeus_typing_blip.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e6a0bdb8ea983384688879ba8f12ea65
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sounds/new_blip.mp3
+++ b/Assets/Sounds/new_blip.mp3
--- a/Assets/Sounds/new_blip.mp3.meta
+++ b/Assets/Sounds/new_blip.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: