Commit 49ca63de authored by JEthan's avatar JEthan
Browse files

fehlende merge datei

parent 6f9068fd
......@@ -7,5 +7,6 @@ PhysicsMaterial2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Stone
friction: 5
friction: 0
bounciness: 0
......@@ -124,7 +124,7 @@ BoxCollider2D:
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 1
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment