summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #932 from erwincoumans/master2.86erwincoumans2017-01-257-32/+110
|\
| * add optimized version of sphere-capsule and capsule-sphere, re-using the caps...Erwin Coumans2017-01-251-3/+47
| * report localVisualFrame instead localInertialFrameErwin Coumans2017-01-253-18/+25
| * remove the contype=0 in inverted_pendulum.xml, so we can 'mouse-pick' the pen...Erwin Coumans2017-01-243-11/+38
|/
* Merge pull request #931 from erwincoumans/mastererwincoumans2017-01-242-2/+4
|\
| * fix a few warningsErwin Coumans2017-01-242-2/+4
|/
* Merge pull request #930 from erwincoumans/mastererwincoumans2017-01-231-1/+2
|\
| * Update btMultiBody.herwincoumans2017-01-231-1/+2
* | Merge pull request #929 from erwincoumans/mastererwincoumans2017-01-234-31/+19
|\ \ | |/
| * more btCapsuleShape fixesErwin Coumans2017-01-234-8/+9
| * drop non-uniform local scaling support for btCapsuleShapeErwin Coumans2017-01-233-23/+10
* | Merge pull request #928 from erwincoumans/mastererwincoumans2017-01-234-6928/+4486
|\ \ | |/
| * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-01-232-6909/+4477
| |\
| | * revert to older version of stb_image, the new version causes issues inErwin Coumans2017-01-232-6909/+4477
| | * Merge remote-tracking branch 'bp/master'Erwin Coumans2017-01-230-0/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #927 from erwincoumans/mastererwincoumans2017-01-236-22/+87
|\ \ \
| | | * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-01-237-23/+88
| | | |\ | | |_|/ | |/| |
| | | * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-01-2255-294/+2038
| | | |\
| | * | | more fixes for btCapsuleShape: its entire radius is collision margin, don't l...Erwin Coumans2017-01-232-19/+9
| |/ / /
| * | | Merge remote-tracking branch 'bp/master'Erwin Coumans2017-01-231-1/+1
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #926 from erwincoumans/mastererwincoumans2017-01-2218-202/+886
|\ \ \ \ | | |_|/ | |/| |
* | | | Merge pull request #925 from erwincoumans/mastererwincoumans2017-01-2146-101/+1161
|\ \ \ \
* \ \ \ \ Merge pull request #921 from benelot/fix-linkstate-errormessageerwincoumans2017-01-201-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Change jointIndex to linkIndex in getLinkState error message.Benelot2017-01-191-1/+1
|/ / / /
* | | | Merge pull request #920 from erwincoumans/mastererwincoumans2017-01-171-0/+0
|\ \ \ \
* \ \ \ \ Merge pull request #919 from erwincoumans/mastererwincoumans2017-01-1714-13/+270
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #918 from erwincoumans/mastererwincoumans2017-01-161-1/+1
|\ \ \ \ \ \
| | | | | | * add capsule support in urdf parser (non-standard extension), capsule.urdfErwin Coumans2017-01-236-22/+87
| | | | | |/
| | | | | * fix OSX build, fix some warningsErwin Coumans2017-01-223-3/+4
| | | | | * add test script to move pr2 controller using pybullet (after initializing the...Erwin Coumans2017-01-221-0/+22
| | | | | * [pybullet] getNumConstraints, getConstraintInfo APIs.Erwin Coumans2017-01-2217-200/+841
| | | | | * pybullet: only allow a single local in-process GUI connectionErwin Coumans2017-01-212-2/+22
| | | | |/
| | | | * add hand.py/hand.ino used to create this VR glove, using MuJoCo Haptix MPL ha...Erwin Coumans2017-01-2040-75/+838
| | | | * Prepare for Bullet 2.86 release, update version to 2.86 (release will be tagg...Erwin Coumans2017-01-209-26/+323
| | | |/
| | | * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-01-171-1/+1
| | | |\ | | | |/ | | |/|
| | * | Update PhysicsServerExample.cpperwincoumans2017-01-171-1/+1
| | | * update pybullet_quickstartguide.pdf to latest fromErwin Coumans2017-01-171-0/+0
| | |/
| | * [pybullet] implement addUserDebugParameter / readUserDebugParameterErwin Coumans2017-01-1714-13/+270
| |/
| * set the paircache filterErwin Coumans2017-01-161-1/+1
|/
* Merge pull request #917 from erwincoumans/mastererwincoumans2017-01-16174-6036/+8676
|\
| * [pybullet] expose collision filter mode and max constraint force:Erwin Coumans2017-01-165-4/+55
| * cmake Win32 fixesErwin Coumans2017-01-1614-28/+50
| * upgrade to latest stb_image fromErwin Coumans2017-01-162-4477/+6909
| * add App_SharedMemoryPhysics and App_SharedMemoryPhysics_GUI to cmakeErwin Coumans2017-01-165-7/+219
| * [MJCF import] add custom broadphase collision filter, for MJCF/MuJoCo compati...Erwin Coumans2017-01-168-24/+156
| * fix many warningsErwin Coumans2017-01-15146-1418/+817
| * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-01-151-15/+27
| |\
| | * add --disable_desktop_gl for Virtual Reality server (App_SharedMemoryPhysics_VR)erwin coumans2017-01-141-15/+27
| |/ |/|
| * Further improvements in Bullet MuJoCo MJCF import:Erwin Coumans2017-01-159-70/+450
|/
* Merge pull request #916 from erwincoumans/mastererwincoumans2017-01-133-9/+12
|\