Merge remote-tracking branch 'upstream/master' into fix_boxbox_collision
Showing
- .travis.yml 41 additions, 0 deletions.travis.yml
- CMakeLists.txt 18 additions, 3 deletionsCMakeLists.txt
- README.md 1 addition, 2 deletionsREADME.md
- ci/install_linux.sh 24 additions, 0 deletionsci/install_linux.sh
- ci/install_osx.sh 6 additions, 0 deletionsci/install_osx.sh
- include/fcl/CMakeLists.txt 8 additions, 2 deletionsinclude/fcl/CMakeLists.txt
- include/fcl/config.h.in 3 additions, 0 deletionsinclude/fcl/config.h.in
- include/fcl/math/matrix_3f.h 2 additions, 2 deletionsinclude/fcl/math/matrix_3f.h
- include/fcl/narrowphase/narrowphase.h 149 additions, 29 deletionsinclude/fcl/narrowphase/narrowphase.h
- src/CMakeLists.txt 2 additions, 2 deletionssrc/CMakeLists.txt
- src/narrowphase/narrowphase.cpp 372 additions, 49 deletionssrc/narrowphase/narrowphase.cpp
- test/CMakeLists.txt 6 additions, 3 deletionstest/CMakeLists.txt
- test/fcl_resources/config.h.in 1 addition, 1 deletiontest/fcl_resources/config.h.in
- test/test_fcl_broadphase.cpp 40 additions, 0 deletionstest/test_fcl_broadphase.cpp
- test/test_fcl_capsule_box_1.cpp 2 additions, 1 deletiontest/test_fcl_capsule_box_1.cpp
- test/test_fcl_capsule_box_2.cpp 6 additions, 4 deletionstest/test_fcl_capsule_box_2.cpp
- test/test_fcl_frontlist.cpp 4 additions, 3 deletionstest/test_fcl_frontlist.cpp
- test/test_fcl_geometric_shapes.cpp 174 additions, 0 deletionstest/test_fcl_geometric_shapes.cpp
- test/test_fcl_octomap.cpp 29 additions, 1 deletiontest/test_fcl_octomap.cpp
- test/test_fcl_simple.cpp 4 additions, 3 deletionstest/test_fcl_simple.cpp
Loading
Please register or sign in to comment