Merge pull request #41 from lge-ros2/develop

Merge 'develop' branch into 'master'

Assets/Scripts/Tools/SDFPlugins/LinkPlugin.cs

@@ -29,8 +29,6 @@ void Awake()
 	// Start is called before the first frame update
 	void Start()
 	{
-		RemoveFixedJointAndRigidBodyParts();
-
 		// Handle self collision
 		if (!isSelfCollide)
 		{
@@ -174,25 +172,6 @@ private void ScaleMassOnJoint()
 		}
 	}
 
-	private void RemoveFixedJointAndRigidBodyParts()
-	{
-		if (TryGetComponent<FixedJoint>(out var fixedJoint))
-		{
-			GameObject.Destroy(fixedJoint);
-
-			if (TryGetComponent<Rigidbody>(out var rigidbody))
-			{
-				rigidbody.isKinematic = true;
-				GameObject.Destroy(rigidbody);
-				transform.localPosition = Vector3.zero;
-				transform.localRotation = Quaternion.identity;
-
-				Debug.LogWarningFormat("[{0}] fixedJoint including Rigidbody will not be implemented as a joint. " +
-								"Only transform parenting for better performance", name);
-			}
-		}
-	}
-
 	public void Reset()
 	{
 		poseControl.Reset();

ProjectSettings/ProjectSettings.asset

@@ -124,7 +124,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.7.6
+  bundleVersion: 1.7.7
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -231,6 +231,7 @@ PlayerSettings:
   metalEditorSupport: 1
   metalAPIValidation: 1
   iOSRenderExtraFrameOnPause: 0
+  iosCopyPluginsCodeInsteadOfSymlink: 0
   appleDeveloperTeamID: 
   iOSManualSigningProvisioningProfileID: 
   tvOSManualSigningProvisioningProfileID: 

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.12f1
-m_EditorVersionWithRevision: 2019.4.12f1 (225e826a680e)
+m_EditorVersion: 2019.4.13f1
+m_EditorVersionWithRevision: 2019.4.13f1 (518737b1de84)