Commit Graph

7982 Commits

Author SHA1 Message Date
erwincoumans
613f39988c Merge pull request #2540 from dbartolini/cleanup-broadphase-proxy
Remove unnecessary copy constructor in btBroadphasePair
2019-12-17 19:08:36 -08:00
erwincoumans
7584847f33 Merge pull request #2537 from erwincoumans/master
fix pybullet_envs path, pybullet version to 2.6.0, allow clang-cl on Windows
2019-12-17 19:06:11 -08:00
erwincoumans
bb3c87681c Merge pull request #2546 from fuchuyuan/smallfix
add link index to setdamping C APIs. If link index is not set, the co…
2019-12-17 15:45:49 -08:00
Chuyuan Fu
0f477e27ae add link index to setdamping C APIs. If link index is not set, the command is igored for rigidbody 2019-12-17 13:48:34 -08:00
Daniele Bartolini
0aa4974b98 Remove unnecessary copy constructor in btBroadphasePair 2019-12-15 00:35:44 +01:00
Erwin Coumans
7241fe19b9 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-12-13 09:21:00 -08:00
Erwin Coumans
30b42a14f0 add single-link arm urdf files for debugging 2019-12-13 09:20:46 -08:00
Erwin Coumans
3668bc5e2a tweak premake4 default batch file.
add manual control for joint angles in XArm6 example.
2019-12-12 07:02:27 -08:00
Erwin Coumans
082a1ddbfe remove bla 2019-12-11 17:08:59 -08:00
Erwin Coumans
1a245f4e11 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-12-11 16:49:04 -08:00
Erwin Coumans
2f6eb59e16 add z-up version of Laikago, centered along the chassis center of mass 2019-12-11 16:47:52 -08:00
Erwin Coumans
2ced9c504a make it a one-liner, so clang-cl doesn't fail on Windows 2019-12-11 14:04:55 -08:00
erwincoumans
08321b96ba Update main_opengl_single_example.cpp
Apply fix from PR #2526 manually, thanks to  Andrew Meadows
2019-12-11 13:59:44 -08:00
Erwin Coumans
202cf18995 allow to compile using clang-cl on visual studio (disable SSE) 2019-12-11 13:07:53 -08:00
Erwin Coumans
9a981f4736 bump up pybullet to 2.6.0 2019-12-10 15:49:31 -08:00
Erwin Coumans
d254b65fee Merge remote-tracking branch 'bp/master' 2019-12-10 15:48:24 -08:00
Erwin Coumans
e7778502e7 fix pybullet_envs path 2019-12-10 15:48:07 -08:00
erwincoumans
6c722f8f94 Merge pull request #2528 from jackson-waschura/master
Actually use self collisions when specified
2019-12-09 09:35:06 -08:00
erwincoumans
880faef997 Merge pull request #2535 from erwincoumans/master
Googley colors for xarm (debugging) and tweak example with table etc.…
2019-12-09 09:26:47 -08:00
Erwin Coumans
1a491dc700 Googley colors for xarm (debugging) and tweak example with table etc. Add missing link6_vhacd.obj 2019-12-09 09:25:15 -08:00
erwincoumans
e0a43fb116 Merge pull request #2534 from erwincoumans/master
remove duplicate xarm6.urdf
2019-12-09 08:57:00 -08:00
Erwin Coumans
0a8ade5233 remove duplicate xarm6.urdf 2019-12-09 08:54:56 -08:00
erwincoumans
1b8d7be2b6 Merge pull request #2533 from erwincoumans/master
also enable simplified convex decomposition collision meshes for xarm…
2019-12-09 08:53:27 -08:00
Erwin Coumans
67905efd0f also enable simplified convex decomposition collision meshes for xarm6_robot.urdf 2019-12-09 08:51:02 -08:00
erwincoumans
e57fb497eb Merge pull request #2530 from davidrusu/unify-uses-of-bullet-client
Unify usage of BulletClient in examples
2019-12-08 19:35:49 -08:00
David Rusu
dd3bdf0da1 Use pybullet_utils.bullet_client for all our BulletClient needs 2019-12-08 20:10:12 -05:00
jackson-waschura
0b33d940e4 Actually use self collisions when specified 2019-12-08 13:54:38 +01:00
erwincoumans
08bc887b19 Merge pull request #2527 from erwincoumans/master
add Franka Panda and XArm6 URDF and examples
2019-12-08 00:41:11 -08:00
Erwin Coumans
70329ca2ad added Apache 2 license for Panda Franka URDF 2019-12-08 00:40:10 -08:00
Erwin Coumans
4cfd30f19c add Franka Panda URDF and example (python3 -m pybullet_envs.examples.loadpanda)
add XArm6 URDF with optimized collision meshes and example (XArm gripper needs more work) python3 -m pybullet_envs.examples.xarm
2019-12-08 00:38:49 -08:00
erwincoumans
d57546b645 Merge pull request #2524 from erwincoumans/master
fix clang warning
2019-12-05 09:04:03 -08:00
Erwin Coumans
146a751eb4 enable intermediate log for walk, so you can restart if stuck in local maximum 2019-12-05 08:34:34 -08:00
Erwin Coumans
8113bc72d5 Merge remote-tracking branch 'bp/master' 2019-12-05 08:06:16 -08:00
Erwin Coumans
7b072f1f28 fix clang warning unction 'btSoftBody::checkDeformableFaceContact' has a definition with different parameter names 2019-12-05 08:05:32 -08:00
erwincoumans
c74b88b436 Merge pull request #2522 from erwincoumans/master
update Laikago robot with textures, and a version with toes to enable…
2019-12-04 21:14:21 -08:00
Erwin Coumans
91328f9280 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2019-12-04 15:49:30 -08:00
Erwin Coumans
7f3059c7a9 increase max number of parameters (to around 300) in debug GUI 2019-12-04 15:49:06 -08:00
Erwin Coumans
7c5796b67d update Laikago robot with textures, and a version with toes to enable inverse kinematics. 2019-12-04 14:48:28 -08:00
erwincoumans
ef08e9b415 Merge pull request #2517 from erwincoumans/master
enable self-collision for deep_mimic pybullet_envs, fix Mac Catalina pybullet pip build
2019-12-04 08:56:42 -08:00
erwincoumans
44f21e462a Merge pull request #2509 from xhan0619/separate-bending-stiffness
Separate in-plane and bending stiffness for mass spring model
2019-12-04 07:34:28 -08:00
Erwin Coumans
763e25dd37 fix Mac Catalina pybullet build (setup.py) 2019-12-03 20:49:08 -08:00
Erwin Coumans
7f9f514b7e enable self-collision for deep_mimic pybullet_envs and make it easier to try it out:
python3 -m pybullet_envs.deep_mimic.testrl
2019-11-30 13:19:28 -08:00
erwincoumans
c4300dc299 Merge pull request #2505 from stephenjust/update-gitignore
Add common CMake and Visual Studio project files to gitignore
2019-11-29 10:31:42 -08:00
erwincoumans
70c064ca0d Merge pull request #2501 from erwincoumans/master
bump up pybullet version, fix old examples
2019-11-29 09:32:15 -08:00
Erwin Coumans
cf67e7af0a Merge remote-tracking branch 'bp/master' 2019-11-29 08:06:53 -08:00
Erwin Coumans
56d0b7a09a deep_mimic, read velocity from poseInterpolator, not kinematic model
This fixes issue #2401
2019-11-29 08:05:54 -08:00
Xuchen Han
8fde74ecea update SHARED_MEMORY_MAGIC_NUMBER 2019-11-28 12:14:40 -08:00
erwincoumans
7546541c85 Merge pull request #2506 from xhan0619/master
Deformable vs. Rigid face contact improvement and Deformable vs. Deformable contact improvement
2019-11-28 06:49:04 -08:00
Xuchen Han
7bce5d61f4 separate in-plane and bending stiffness for mass spring model for easier parameter tuning 2019-11-27 11:40:10 -08:00
Xuchen Han
39df98465e set a smaller dt for deformable_ball.py for stability and typo fix 2019-11-25 17:07:00 -08:00