Skip to content
Snippets Groups Projects
Commit a7e4f912 authored by Alexander Gatland's avatar Alexander Gatland
Browse files

Merge branch 'alexander' into 'main'

tilemap collider boxes tweaked

See merge request !78
parents d36bad11 22e9ea76
No related branches found
No related tags found
1 merge request!78tilemap collider boxes tweaked
...@@ -33,7 +33,7 @@ TextureImporter: ...@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 1 filterMode: 0
aniso: 1 aniso: 1
mipBias: 0 mipBias: 0
wrapU: 1 wrapU: 1
......
...@@ -33,7 +33,7 @@ TextureImporter: ...@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 1 filterMode: 0
aniso: 1 aniso: 1
mipBias: 0 mipBias: 0
wrapU: 1 wrapU: 1
......
...@@ -581,7 +581,11 @@ TextureImporter: ...@@ -581,7 +581,11 @@ TextureImporter:
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape:
- - {x: 0, y: 4}
- {x: 0, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 4}
tessellationDetail: 0 tessellationDetail: 0
bones: [] bones: []
spriteID: d76be1ed7b11f6a44a42ed64755574ef spriteID: d76be1ed7b11f6a44a42ed64755574ef
...@@ -602,7 +606,11 @@ TextureImporter: ...@@ -602,7 +606,11 @@ TextureImporter:
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape:
- - {x: -16, y: 4}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 4}
tessellationDetail: 0 tessellationDetail: 0
bones: [] bones: []
spriteID: e913d1eb61c36db44b54a48ea80056d7 spriteID: e913d1eb61c36db44b54a48ea80056d7
...@@ -623,7 +631,15 @@ TextureImporter: ...@@ -623,7 +631,15 @@ TextureImporter:
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape:
- - {x: -16, y: 4}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 4}
- - {x: -9, y: 4}
- {x: 13, y: 4}
- {x: 13, y: -16}
- {x: -9, y: -16}
tessellationDetail: 0 tessellationDetail: 0
bones: [] bones: []
spriteID: 464d7b3c235cf0f4cac86cdf34beb2f0 spriteID: 464d7b3c235cf0f4cac86cdf34beb2f0
......
This diff is collapsed.
...@@ -33,4 +33,4 @@ MonoBehaviour: ...@@ -33,4 +33,4 @@ MonoBehaviour:
e33: 1 e33: 1
m_InstancedGameObject: {fileID: 0} m_InstancedGameObject: {fileID: 0}
m_Flags: 1 m_Flags: 1
m_ColliderType: 1 m_ColliderType: 0
...@@ -33,4 +33,4 @@ MonoBehaviour: ...@@ -33,4 +33,4 @@ MonoBehaviour:
e33: 1 e33: 1
m_InstancedGameObject: {fileID: 0} m_InstancedGameObject: {fileID: 0}
m_Flags: 1 m_Flags: 1
m_ColliderType: 1 m_ColliderType: 0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment