| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #932 from erwincoumans/master2.86 | erwincoumans | 2017-01-25 | 7 | -32/+110 |
|\ |
|
| * | add optimized version of sphere-capsule and capsule-sphere, re-using the caps... | Erwin Coumans | 2017-01-25 | 1 | -3/+47 |
| * | report localVisualFrame instead localInertialFrame | Erwin Coumans | 2017-01-25 | 3 | -18/+25 |
| * | remove the contype=0 in inverted_pendulum.xml, so we can 'mouse-pick' the pen... | Erwin Coumans | 2017-01-24 | 3 | -11/+38 |
|/ |
|
* | Merge pull request #931 from erwincoumans/master | erwincoumans | 2017-01-24 | 2 | -2/+4 |
|\ |
|
| * | fix a few warnings | Erwin Coumans | 2017-01-24 | 2 | -2/+4 |
|/ |
|
* | Merge pull request #930 from erwincoumans/master | erwincoumans | 2017-01-23 | 1 | -1/+2 |
|\ |
|
| * | Update btMultiBody.h | erwincoumans | 2017-01-23 | 1 | -1/+2 |
* | | Merge pull request #929 from erwincoumans/master | erwincoumans | 2017-01-23 | 4 | -31/+19 |
|\ \
| |/ |
|
| * | more btCapsuleShape fixes | Erwin Coumans | 2017-01-23 | 4 | -8/+9 |
| * | drop non-uniform local scaling support for btCapsuleShape | Erwin Coumans | 2017-01-23 | 3 | -23/+10 |
* | | Merge pull request #928 from erwincoumans/master | erwincoumans | 2017-01-23 | 4 | -6928/+4486 |
|\ \
| |/ |
|
| * | Merge branch 'master' of https://github.com/erwincoumans/bullet3 | Erwin Coumans | 2017-01-23 | 2 | -6909/+4477 |
| |\ |
|
| | * | revert to older version of stb_image, the new version causes issues in | Erwin Coumans | 2017-01-23 | 2 | -6909/+4477 |
| | * | Merge remote-tracking branch 'bp/master' | Erwin Coumans | 2017-01-23 | 0 | -0/+0 |
| | |\
| |_|/
|/| | |
|
* | | | Merge pull request #927 from erwincoumans/master | erwincoumans | 2017-01-23 | 6 | -22/+87 |
|\ \ \ |
|
| | | * | Merge branch 'master' of https://github.com/erwincoumans/bullet3 | Erwin Coumans | 2017-01-23 | 7 | -23/+88 |
| | | |\
| | |_|/
| |/| | |
|
| | | * | Merge branch 'master' of https://github.com/erwincoumans/bullet3 | Erwin Coumans | 2017-01-22 | 55 | -294/+2038 |
| | | |\ |
|
| | * | | | more fixes for btCapsuleShape: its entire radius is collision margin, don't l... | Erwin Coumans | 2017-01-23 | 2 | -19/+9 |
| |/ / / |
|
| * | | | Merge remote-tracking branch 'bp/master' | Erwin Coumans | 2017-01-23 | 1 | -1/+1 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #926 from erwincoumans/master | erwincoumans | 2017-01-22 | 18 | -202/+886 |
|\ \ \ \
| | |_|/
| |/| | |
|
* | | | | Merge pull request #925 from erwincoumans/master | erwincoumans | 2017-01-21 | 46 | -101/+1161 |
|\ \ \ \ |
|
* \ \ \ \ | Merge pull request #921 from benelot/fix-linkstate-errormessage | erwincoumans | 2017-01-20 | 1 | -1/+1 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Change jointIndex to linkIndex in getLinkState error message. | Benelot | 2017-01-19 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge pull request #920 from erwincoumans/master | erwincoumans | 2017-01-17 | 1 | -0/+0 |
|\ \ \ \ |
|
* \ \ \ \ | Merge pull request #919 from erwincoumans/master | erwincoumans | 2017-01-17 | 14 | -13/+270 |
|\ \ \ \ \ |
|
* \ \ \ \ \ | Merge pull request #918 from erwincoumans/master | erwincoumans | 2017-01-16 | 1 | -1/+1 |
|\ \ \ \ \ \ |
|
| | | | | | * | add capsule support in urdf parser (non-standard extension), capsule.urdf | Erwin Coumans | 2017-01-23 | 6 | -22/+87 |
| | | | | |/ |
|
| | | | | * | fix OSX build, fix some warnings | Erwin Coumans | 2017-01-22 | 3 | -3/+4 |
| | | | | * | add test script to move pr2 controller using pybullet (after initializing the... | Erwin Coumans | 2017-01-22 | 1 | -0/+22 |
| | | | | * | [pybullet] getNumConstraints, getConstraintInfo APIs. | Erwin Coumans | 2017-01-22 | 17 | -200/+841 |
| | | | | * | pybullet: only allow a single local in-process GUI connection | Erwin Coumans | 2017-01-21 | 2 | -2/+22 |
| | | | |/ |
|
| | | | * | add hand.py/hand.ino used to create this VR glove, using MuJoCo Haptix MPL ha... | Erwin Coumans | 2017-01-20 | 40 | -75/+838 |
| | | | * | Prepare for Bullet 2.86 release, update version to 2.86 (release will be tagg... | Erwin Coumans | 2017-01-20 | 9 | -26/+323 |
| | | |/ |
|
| | | * | Merge branch 'master' of https://github.com/erwincoumans/bullet3 | Erwin Coumans | 2017-01-17 | 1 | -1/+1 |
| | | |\
| | | |/
| | |/| |
|
| | * | | Update PhysicsServerExample.cpp | erwincoumans | 2017-01-17 | 1 | -1/+1 |
| | | * | update pybullet_quickstartguide.pdf to latest from | Erwin Coumans | 2017-01-17 | 1 | -0/+0 |
| | |/ |
|
| | * | [pybullet] implement addUserDebugParameter / readUserDebugParameter | Erwin Coumans | 2017-01-17 | 14 | -13/+270 |
| |/ |
|
| * | set the paircache filter | Erwin Coumans | 2017-01-16 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #917 from erwincoumans/master | erwincoumans | 2017-01-16 | 174 | -6036/+8676 |
|\ |
|
| * | [pybullet] expose collision filter mode and max constraint force: | Erwin Coumans | 2017-01-16 | 5 | -4/+55 |
| * | cmake Win32 fixes | Erwin Coumans | 2017-01-16 | 14 | -28/+50 |
| * | upgrade to latest stb_image from | Erwin Coumans | 2017-01-16 | 2 | -4477/+6909 |
| * | add App_SharedMemoryPhysics and App_SharedMemoryPhysics_GUI to cmake | Erwin Coumans | 2017-01-16 | 5 | -7/+219 |
| * | [MJCF import] add custom broadphase collision filter, for MJCF/MuJoCo compati... | Erwin Coumans | 2017-01-16 | 8 | -24/+156 |
| * | fix many warnings | Erwin Coumans | 2017-01-15 | 146 | -1418/+817 |
| * | Merge branch 'master' of https://github.com/erwincoumans/bullet3 | Erwin Coumans | 2017-01-15 | 1 | -15/+27 |
| |\ |
|
| | * | add --disable_desktop_gl for Virtual Reality server (App_SharedMemoryPhysics_VR) | erwin coumans | 2017-01-14 | 1 | -15/+27 |
| |/
|/| |
|
| * | Further improvements in Bullet MuJoCo MJCF import: | Erwin Coumans | 2017-01-15 | 9 | -70/+450 |
|/ |
|
* | Merge pull request #916 from erwincoumans/master | erwincoumans | 2017-01-13 | 3 | -9/+12 |
|\ |
|