Merge remote-tracking branch 'origin/master'

64932f68 · Jan Meissner · ba3b55bb · 41e58555 · 64932f68 · 64932f68
Commit 64932f68 authored Sep 29, 2018 by Jan Meissner
--- a/Assets/_Game/Scenes/Levels/Level10.unity
+++ b/Assets/_Game/Scenes/Levels/Level10.unity
--- a/Assets/_Game/Scenes/Levels/Level11.unity
+++ b/Assets/_Game/Scenes/Levels/Level11.unity
--- a/Assets/_Game/Scenes/Levels/Level12.unity
+++ b/Assets/_Game/Scenes/Levels/Level12.unity
--- a/Assets/_Game/Scenes/LightTest.meta
+++ b/Assets/_Game/Scenes/LightTest.meta
+fileFormatVersion: 2
+guid: 7d76a63dfd317814d9eef925c0df39c7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/Tilesets/Obstacles.meta
+++ b/Assets/_Game/Scenes/Tilesets/Obstacles.meta
+fileFormatVersion: 2
+guid: 7302d929ac7a2f44180b44e09592ac8a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: