Merge branch 'staging' into portals-and-body

2022-03-29 09:30:41 +00:00
parent a71043121f 0bd4fcc0a0
commit c539311caf
115 changed files with 20376 additions and 4814 deletions
--- a/Assets/Scenes/Arlo/Playground.unity
+++ b/Assets/Scenes/Arlo/Playground.unity
--- a/Assets/Scenes/Helar/HelarTest.unity
+++ b/Assets/Scenes/Helar/HelarTest.unity
--- a/Assets/Scenes/JonasB/Dungeon.unity.meta
+++ b/Assets/Scenes/JonasB/Dungeon.unity.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta
+guid: d28d613c510a3b449a9070c2eb2b61c0
+PrefabImporter:
+========
 guid: f6d31dc9e750063448915a12546cf689
 DefaultImporter:
+>>>>>>>> origin/DoorInteration:Assets/Scenes/JonasB/Dungeon.unity.meta
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Scenes/JoonasP/SampleScene.unity
+++ b/Assets/Scenes/JoonasP/SampleScene.unity
--- a/Assets/Scenes/JoonasP/SampleScene/GameObject
+++ b/Assets/Scenes/JoonasP/SampleScene/GameObject
@@ -21,7 +21,7 @@ MonoBehaviour:
    m_Value: {x: 0.5, y: 0.5}
  intensity:
    m_OverrideState: 1
-    m_Value: 1
+    m_Value: 0
  smoothness:
    m_OverrideState: 1
    m_Value: 1
--- a/Assets/Scenes/Shumpei/SampleScene.unity
+++ b/Assets/Scenes/Shumpei/SampleScene.unity