From ebeb5df253a75fddb5b919d3da720c635fa8d703 Mon Sep 17 00:00:00 2001 From: jilfranco-unity Date: Thu, 10 Aug 2023 14:05:56 -0400 Subject: [PATCH 1/3] changed the scale on diagonal wall colliders to not be negative --- .../env_wall1_base_diagonal_1.prefab | 19 +++++++++++++++---- .../env_wall1_base_diagonal_2.prefab | 17 ++++++++++++++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab b/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab index bfe6e7460..a09767a8d 100644 --- a/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab +++ b/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab @@ -28,6 +28,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 5915529853195630635} m_Father: {fileID: 0} @@ -52,6 +53,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -106,13 +108,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8750842352150602452} - m_LocalRotation: {x: -0.92387956, y: -0.00000017299969, z: -0.38268343, w: -0.00000007165881} + m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: -2.02, y: 1.96, z: -2.01} - m_LocalScale: {x: -1, y: -1, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4437348436208465204} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -180, y: -45, z: -0.000015258789} + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!65 &7898993292670171814 BoxCollider: m_ObjectHideFlags: 0 @@ -121,8 +124,16 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8750842352150602452} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 4, z: 6} m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab b/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab index 0a2410fda..055906dc9 100644 --- a/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab +++ b/Assets/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab @@ -28,6 +28,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8193510332667705931} m_Father: {fileID: 0} @@ -52,6 +53,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -107,8 +109,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4914060456935432399} m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: 2.5663843, y: 1.5000002, z: 2.5656066} + m_LocalPosition: {x: -1.83, y: 2.03, z: -2.11} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2698721903467665021} m_RootOrder: 0 @@ -121,8 +124,16 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4914060456935432399} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 4, z: 6} - m_Center: {x: -6.5, y: 0.5, z: 0} + m_Center: {x: 0, y: 0, z: 0} From 0927aadbe63427858b9a15161eb2bfb0cb4f1eb3 Mon Sep 17 00:00:00 2001 From: jilfranco-unity Date: Thu, 10 Aug 2023 14:16:32 -0400 Subject: [PATCH 2/3] changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 786eb6616..7ea992a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com). +## [Unreleased] + +### Fixed +* Fixed colliders on diagonal walls to not have negative scale. + + ## [2.2.0] - 2023-07-06 ### Added From 7712c21d9d5b302e0ecf1e2030926bb8525c9946 Mon Sep 17 00:00:00 2001 From: jilfranco-unity Date: Fri, 11 Aug 2023 15:56:02 -0400 Subject: [PATCH 3/3] added PR number to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ea992a44..4bbe2854a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [Unreleased] ### Fixed -* Fixed colliders on diagonal walls to not have negative scale. +* Fixed colliders on diagonal walls to not have negative scale (#854). ## [2.2.0] - 2023-07-06