Commit 91e6ed29 authored by Tommé Nöll's avatar Tommé Nöll
Browse files

merge Jonas, conflict in tutorial

parents 8a53f0f7 e1ce86ed
......@@ -45,7 +45,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 200
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......@@ -69,6 +69,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
......
......@@ -75,7 +75,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 250
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
......
......@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 8320450346667173300}
- component: {fileID: 7341239521485774464}
- component: {fileID: -3588197436131663497}
- component: {fileID: -7165583038676321680}
m_Layer: 8
m_Name: TestStone
m_TagString: Untagged
......@@ -28,7 +29,7 @@ Transform:
m_GameObject: {fileID: 2410282298153064044}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.5005, y: 2.4984, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_LocalScale: {x: 0.75, y: 0.75, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -171,3 +172,16 @@ PolygonCollider2D:
- {x: 0.052021943, y: -0.9583485}
- {x: 0.61, y: -0.94}
- {x: 0.65361506, y: -0.9469895}
--- !u!114 &-7165583038676321680
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2410282298153064044}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9119a648cccf69c498732d92d9ef1c4c, type: 3}
m_Name:
m_EditorClassIdentifier:
isHeavy: 0
This diff is collapsed.
......@@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: PostEffectMaterial
m_Shader: {fileID: 4800000, guid: b03400fe030c84d5190226dd242b03dd, type: 3}
m_ShaderKeywords:
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
......
Supports Markdown
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