Merge master into 'Neue-Level'

pklaschka · May 29, 2017 · 0381859 · 0381859
2 parents 3a90b9e + 8260c6f
commit 0381859
Show file tree

Hide file tree

Showing 127 changed files with 12,229 additions and 5,658 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,9 @@ sysinfo.txt
 *.unitypackage
 Platformer_001/Library/ScriptMapper
 Platformer_001/Library/AssetImportState
+
+Platformer_001/Assets/RiderIntegration/
+
+Platformer_001/Assets/RiderIntegration\.meta
+
+Platformer_001/\.idea/
diff --git a/Design/Icon-Export/App Icon.png b/Design/Icon-Export/App Icon.png
diff --git a/Design/Icon-Export/App Icon@0,5x.png b/Design/Icon-Export/App Icon@0,5x.png
diff --git a/Design/Icon-Export/App [email protected] b/Design/Icon-Export/App [email protected]
diff --git a/Design/Icon.psd b/Design/Icon.psd
diff --git a/Platformer_001/Assets/MusicGenerator.cs b/Platformer_001/Assets/MusicGenerator.cs
diff --git a/Platformer_001/Assets/Prefabs/Enemys/Schleim.prefab b/Platformer_001/Assets/Prefabs/Enemys/Schleim.prefab
@@ -329,6 +329,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  selbstZerstoerenBeiTod: 1
   hpAnzeige: {fileID: 0}
 --- !u!114 &114799338532626626
 MonoBehaviour:

diff --git a/Platformer_001/Assets/Prefabs/Tiles/BasicTile.prefab b/Platformer_001/Assets/Prefabs/Tiles/BasicTile.prefab
@@ -37,7 +37,7 @@ Transform:
   m_GameObject: {fileID: 1792102471104630}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 10.205129, y: 11.969703, z: 0}
-  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -53,13 +53,13 @@ EdgeCollider2D:
   m_Material: {fileID: 6200000, guid: 47c1bdd6919415b4db67b378a9adaa6b, type: 2}
   m_IsTrigger: 0
   m_UsedByEffector: 1
-  m_Offset: {x: -0.5, y: -0.5}
+  m_Offset: {x: -1, y: 0}
   m_Points:
-  - {x: 0, y: 0}
-  - {x: 1, y: 0}
-  - {x: 1, y: 1}
+  - {x: 0, y: -1}
+  - {x: 2, y: -1}
+  - {x: 2, y: 1}
   - {x: 0, y: 1}
-  - {x: 0, y: 0}
+  - {x: 0, y: -1}
 --- !u!212 &212374159688009474
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -107,7 +107,7 @@ PlatformEffector2D:
     serializedVersion: 2
     m_Bits: 4294967295
   m_RotationalOffset: 0
-  m_UseOneWay: 1
+  m_UseOneWay: 0
   m_UseOneWayGrouping: 0
   m_SurfaceArc: 180
   m_UseSideFriction: 0

diff --git a/Platformer_001/Assets/Prefabs/Tiles/grass.prefab b/Platformer_001/Assets/Prefabs/Tiles/grass.prefab
@@ -107,7 +107,7 @@ PlatformEffector2D:
     serializedVersion: 2
     m_Bits: 4294967295
   m_RotationalOffset: 0
-  m_UseOneWay: 1
+  m_UseOneWay: 0
   m_UseOneWayGrouping: 0
   m_SurfaceArc: 180
   m_UseSideFriction: 0

diff --git a/Platformer_001/Assets/Prefabs/Tiles/red_brick.prefab b/Platformer_001/Assets/Prefabs/Tiles/red_brick.prefab
@@ -107,7 +107,7 @@ PlatformEffector2D:
     serializedVersion: 2
     m_Bits: 4294967295
   m_RotationalOffset: 0
-  m_UseOneWay: 1
+  m_UseOneWay: 0
   m_UseOneWayGrouping: 0
   m_SurfaceArc: 180
   m_UseSideFriction: 0

diff --git a/Platformer_001/Assets/Prefabs/Tiles/stone.prefab b/Platformer_001/Assets/Prefabs/Tiles/stone.prefab
@@ -107,7 +107,7 @@ PlatformEffector2D:
     serializedVersion: 2
     m_Bits: 4294967295
   m_RotationalOffset: 0
-  m_UseOneWay: 1
+  m_UseOneWay: 0
   m_UseOneWayGrouping: 0
   m_SurfaceArc: 180
   m_UseSideFriction: 0

diff --git a/Platformer_001/Assets/Prefabs/Tiles/stone_brick.prefab b/Platformer_001/Assets/Prefabs/Tiles/stone_brick.prefab
@@ -107,7 +107,7 @@ PlatformEffector2D:
     serializedVersion: 2
     m_Bits: 4294967295
   m_RotationalOffset: 0
-  m_UseOneWay: 1
+  m_UseOneWay: 0
   m_UseOneWayGrouping: 0
   m_SurfaceArc: 180
   m_UseSideFriction: 0

diff --git a/Platformer_001/Assets/Prefabs/UI.meta b/Platformer_001/Assets/Prefabs/UI.meta