Merge branch 'master' into level_detail_bc

2018-09-02 21:03:34 +02:00
parent 497c653196 735d943773
commit e7054d137e
45 changed files with 18609 additions and 4548 deletions
--- a/Assets/Scenes/Level_Cave.meta
+++ b/Assets/Scenes/Level_Cave.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8474bc0970add074896554ade8eb7108
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/Levelpart_Forest.unity
+++ b/Assets/Scenes/Levelpart_Forest.unity