final merge 22-03-22

38410bbb · sgabsi · 0d655b29 · 38410bbb · 38410bbb · 38410bbb
Commit 38410bbb authored 3 years ago by sgabsi
--- a/Assets/Scripts/Exp.meta
+++ b/Assets/Scripts/Exp.meta
 fileFormatVersion: 2
-guid: f924adb934d76b34089c4f344cadd702
+guid: c49391a392ad03f4a88e61cb09dd9f21
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}

--- a/Assets/AudioMixer.mixer
+++ b/Assets/AudioMixer.mixer
--- a/Assets/AudioMixer.mixer.meta
+++ b/Assets/AudioMixer.mixer.meta
--- a/Assets/PlayerMixer.mixer
+++ b/Assets/PlayerMixer.mixer
--- a/Assets/PlayerMixer.mixer.meta
+++ b/Assets/PlayerMixer.mixer.meta
--- a/Assets/Scenes/testTerrain.unity
+++ b/Assets/Scenes/testTerrain.unity
--- a/Assets/Scenes/testTerrain.unity.meta
+++ b/Assets/Scenes/testTerrain.unity.meta
--- a/Assets/terrainCleme.asset
+++ b/Assets/terrainCleme.asset
--- a/Assets/terrainCleme.asset.meta
+++ b/Assets/terrainCleme.asset.meta