Merge remote-tracking branch 'origin/release-6.4'

# Conflicts: # CHANGELOG.md # CMakeLists.txt # LICENSE # cmake/FindFLANN.cmake # dart/planning/Path.cpp # dart/planning/Path.hpp # dart/planning/PathFollowingTrajectory.cpp # dart/planning/PathFollowingTrajectory.hpp # dart/planning/PathPlanner.hpp # dart/planning/PathShortener.cpp # dart/planning/PathShortener.hpp # dart/planning/RRT.cpp # dart/planning/RRT.hpp # dart/planning/Trajectory.hpp # package.xml
dartsim · Oct 23, 2017 · 37bec25 · 37bec25
2 parents dcfaec9 + 118b45d
commit 37bec25
Show file tree

Hide file tree

Showing 616 changed files with 2,481 additions and 1,799 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 ### DART 6.4.0 (201X-XX-XX)
 
+* License
+
+  * Added Personal Robotics Lab and Open Source Robotics Foundation as contributors: [#929](https://github.com/dartsim/dart/pull/929)
+
 ### [DART 6.3.0 (2017-10-04)](https://github.com/dartsim/dart/milestone/36?closed=1)
 
 * Collision detection

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,6 +10,7 @@ The code doesn't need to be perfect right away, feel free to post work-in-progre
 ----------------------------------------------------|---------------
  [C. Karen Liu](https://github.com/karenliu)        | project creator, multibody dynamics, constraint resolution, tutorials
  [Mike Stilman](https://github.com/mstilman)        | project creator
+ [Siddhartha S. Srinivasa](https://github.com/siddhss5) | project advisor
  [Jeongseok Lee](https://github.com/jslee02)        | project director, multibody dynamics, constraint resolution, collision detection, tutorials
  [Michael X. Grey](https://github.com/mxgrey)       | project director, extensive API improvements, inverse kinematics, gui::osg, tutorials
  [Tobias Kunz](https://github.com/tobiaskunz)       | former project director, motion planner

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,8 @@
 Copyright (c) 2011-2016, Humanoid Lab, Georgia Tech Research Corporation
-Copyright (c) 2011-2017, Graphics Lab, Georgia Tech Research Corporation
 Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+Copyright (c) 2011-2017, Graphics Lab, Georgia Tech Research Corporation
+Copyright (c) 2017, Personal Robotics Lab, University of Washington
+Copyright (c) 2017, Open Source Robotics Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/cmake/FindASSIMP.cmake b/cmake/FindASSIMP.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find ASSIMP

diff --git a/cmake/FindCCD.cmake b/cmake/FindCCD.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find CCD

diff --git a/cmake/FindEIGEN3.cmake b/cmake/FindEIGEN3.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find Eigen

diff --git a/cmake/FindFCL.cmake b/cmake/FindFCL.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find FCL

diff --git a/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find IPOPT

diff --git a/cmake/FindNLOPT.cmake b/cmake/FindNLOPT.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find NLOPT

diff --git a/cmake/FindODE.cmake b/cmake/FindODE.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find ODE

diff --git a/cmake/FindSHARK.cmake b/cmake/FindSHARK.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find SHARK

diff --git a/cmake/FindTINYXML.cmake b/cmake/FindTINYXML.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find TINYXML

diff --git a/cmake/FindTINYXML2.cmake b/cmake/FindTINYXML2.cmake
@@ -1,6 +1,9 @@
-# Copyright (c) 2015-2016, Humanoid Lab, Georgia Tech Research Corporation
-# Copyright (c) 2015-2017, Graphics Lab, Georgia Tech Research Corporation
-# Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+# Copyright (c) 2011-2017, The DART development contributors
+# All rights reserved.
+#
+# The list of contributors can be found at:
+#   https://github.com/dartsim/dart/blob/master/LICENSE
+#
 # This file is provided under the "BSD-style" License
 
 # Find TINYXML2

diff --git a/dart/collision/CollisionDetector.cpp b/dart/collision/CollisionDetector.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2013-2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2013-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionDetector.hpp b/dart/collision/CollisionDetector.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2013-2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2013-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionFilter.cpp b/dart/collision/CollisionFilter.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionFilter.hpp b/dart/collision/CollisionFilter.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionGroup.cpp b/dart/collision/CollisionGroup.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionGroup.hpp b/dart/collision/CollisionGroup.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionObject.cpp b/dart/collision/CollisionObject.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionObject.hpp b/dart/collision/CollisionObject.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionOption.cpp b/dart/collision/CollisionOption.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionOption.hpp b/dart/collision/CollisionOption.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionResult.cpp b/dart/collision/CollisionResult.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/CollisionResult.hpp b/dart/collision/CollisionResult.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/Contact.cpp b/dart/collision/Contact.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/Contact.hpp b/dart/collision/Contact.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/DistanceFilter.cpp b/dart/collision/DistanceFilter.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/DistanceFilter.hpp b/dart/collision/DistanceFilter.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following

diff --git a/dart/collision/DistanceOption.cpp b/dart/collision/DistanceOption.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016, Humanoid Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Graphics Lab, Georgia Tech Research Corporation
- * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University
+ * Copyright (c) 2011-2017, The DART development contributors
  * All rights reserved.
  *
+ * The list of contributors can be found at:
+ *   https://github.com/dartsim/dart/blob/master/LICENSE
+ *
  * This file is provided under the following "BSD-style" License:
  *   Redistribution and use in source and binary forms, with or
  *   without modification, are permitted provided that the following