Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame

2020-02-01 08:52:56 +01:00 · 2020-02-01 08:52:56 +01:00 · 8e08381478
parent a787aa09a3 cdb1d46de7
commit 8e08381478
21 changed files with 15 additions and 2 deletions
--- a/Assets/Models/ammo.blend
+++ b/Assets/Models/ammo.blend
--- a/Assets/Models/ammo.blend1
+++ b/Assets/Models/ammo.blend1
--- a/Assets/Models/cabin.blend
+++ b/Assets/Models/cabin.blend
--- a/Assets/Models/cabin.blend1
+++ b/Assets/Models/cabin.blend1
--- a/Assets/Models/door.blend
+++ b/Assets/Models/door.blend
--- a/Assets/Models/door.blend.meta
+++ b/Assets/Models/door.blend.meta
@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: c5e781ac470bf2c469882550ede67f06
 ModelImporter:
  serializedVersion: 19300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: -623603649343465320
+    second: Scene
  externalObjects: {}
  materials:
    materialImportMode: 1
--- a/Assets/Models/door.blend1
+++ b/Assets/Models/door.blend1
--- a/Assets/Models/door.blend1.meta
+++ b/Assets/Models/door.blend1.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dc9f8ac2b089b4149815c1358a1d74e8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/ladder.blend
+++ b/Assets/Models/ladder.blend
--- a/Assets/Models/ladder.blend1
+++ b/Assets/Models/ladder.blend1
--- a/Assets/Models/needle_tree.blend
+++ b/Assets/Models/needle_tree.blend
--- a/Assets/Models/needle_tree.blend1
+++ b/Assets/Models/needle_tree.blend1
--- a/Assets/Models/radio.blend
+++ b/Assets/Models/radio.blend
--- a/Assets/Models/shotgun.blend
+++ b/Assets/Models/shotgun.blend
--- a/Assets/Models/shotgun.blend.meta
+++ b/Assets/Models/shotgun.blend.meta
@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: f7fb72950098ea84fbcb73709374e822
 ModelImporter:
  serializedVersion: 19300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: -623603649343465320
+    second: Scene
  externalObjects: {}
  materials:
    materialImportMode: 1
--- a/Assets/Models/shotgun.blend1
+++ b/Assets/Models/shotgun.blend1
--- a/Assets/Models/table.blend
+++ b/Assets/Models/table.blend
--- a/Assets/Models/wooden_plank.blend
+++ b/Assets/Models/wooden_plank.blend
--- a/Assets/Models/wooden_plank.blend1
+++ b/Assets/Models/wooden_plank.blend1
--- a/Assets/Models/wooden_plank_stokpile.blend
+++ b/Assets/Models/wooden_plank_stokpile.blend
--- a/Assets/Models/wooden_plank_stokpile.blend1
+++ b/Assets/Models/wooden_plank_stokpile.blend1