Merge branch 'master' into respawn

2018-09-01 12:49:46 +02:00
parent e135fd5d19 5692f45d51
commit f49fdce1be
5 changed files with 107 additions and 20 deletions
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -477,6 +477,16 @@ Prefab:
      propertyPath: m_RootOrder
      value: 5
      objectReference: {fileID: 0}
+    - target: {fileID: 114123996009525022, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: canGlide
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114123996009525022, guid: 8bcf2afca6664234f83b5ee8381b1975,
+        type: 2}
+      propertyPath: glideForce
+      value: 3
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2}
  m_IsPrefabAsset: 0