Merge branch 'master' into 1.1

# Conflicts: # Source/Engine/Content/JsonAsset.h # Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
parent bd5897eaab 2357b60d0e
commit 312e4ad010
77 changed files with 1111 additions and 531 deletions
--- a/Source/Engine/Physics/Colliders/CharacterController.cpp
+++ b/Source/Engine/Physics/Colliders/CharacterController.cpp
@@ -343,6 +343,11 @@ void CharacterController::OnTransformChanged()
        UpdateScale();
        UpdateBounds();
    }
+    else if (!_controller)
+    {
+        _box = BoundingBox(_transform.Translation, _transform.Translation);
+        BoundingSphere::FromBox(_box, _sphere);
+    }
 }

 void CharacterController::Serialize(SerializeStream& stream, const void* otherObj)