Merge branch 'Bestenliste'

pklaschka · May 28, 2017 · e9f2ffe · e9f2ffe
2 parents 0ff097d + e0cc9d3
commit e9f2ffe
Show file tree

Hide file tree

Showing 19 changed files with 2,302 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ Platformer_001/Library/AssetImportState
 Platformer_001/Assets/RiderIntegration/
 
 Platformer_001/Assets/RiderIntegration\.meta
+
+Platformer_001/\.idea/
diff --git a/Platformer_001/Assets/Prefabs/UI/placeholder.prefab b/Platformer_001/Assets/Prefabs/UI/placeholder.prefab
@@ -86,7 +86,7 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1560708570478938}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
@@ -96,5 +96,5 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 10, y: 10}
+  m_SizeDelta: {x: 10, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ Platformer_001/Library/AssetImportState
		Platformer_001/Assets/RiderIntegration/

		Platformer_001/Assets/RiderIntegration\.meta

		Platformer_001/\.idea/