summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "C api refactor build"revert-2221-c_api_refactor_builderwincoumans2019-06-144-246/+175
* Merge pull request #2270 from jamoflaw/deadlock-on-exiterwincoumans2019-06-101-1/+1
|\
| * Destroy semaphore after joinjamoflaw2019-05-271-1/+1
* | Merge pull request #2279 from AndreaCatania/patch-3erwincoumans2019-06-101-2/+2
|\ \
| * | Fix initialization orderAndrea Catania2019-06-031-2/+2
|/ /
* | Merge pull request #2276 from erwincoumans/mastererwincoumans2019-06-028-69/+292
|\ \
| * | update ExampleBrowser InverseKinematics example to track 4 end effectors at o...erwincoumans2019-06-012-52/+142
| * | Merge remote-tracking branch 'bp/master'erwincoumans2019-06-015-178/+249
| |\ \ | |/ / |/| |
* | | Update btLemkeSolver.herwincoumans2019-05-311-3/+3
* | | Merge pull request #2221 from goretkin/c_api_refactor_builderwincoumans2019-05-314-175/+246
|\ \ \
| * | | Remove hail-Mary attempt at finding OpenGLGustavo Goretkin2019-05-061-2/+0
| * | | Always link against OpenGLGustavo Goretkin2019-05-031-1/+2
| * | | Play around with buildGustavo Goretkin2019-04-291-0/+1
| * | | Copy installation commands from other bullet libsGustavo Goretkin2019-04-291-1/+24
| * | | Install C APIGustavo Goretkin2019-04-291-1/+3
| * | | Refactor C API part of pybullet outGustavo Goretkin2019-04-293-200/+16
| * | | Copy from pybulletGustavo Goretkin2019-04-291-0/+217
| * | | Run cmake-formatGustavo Goretkin2019-04-291-158/+171
* | | | Merge pull request #2273 from erwincoumans/mastererwincoumans2019-05-3120-2305/+125779
|\ \ \ \
| | | * \ Merge branch 'master' of https://github.com/erwincoumans/bullet3erwincoumans2019-06-0139-9159/+135069
| | | |\ \
| | | | * | fix some warningsErwin Coumans2019-05-314-16/+16
| | | | * | add toes to Mini CheetahErwin Coumans2019-05-311-0/+133
| | |_|/ / | |/| | |
| * | | | Add approximate Mini Cheetah URDF and example in pybulletErwin Coumans2019-05-316-0/+125777
| * | | | fix issue in MJCF importer due to previous commitErwin Coumans2019-05-301-1/+0
| * | | | change quadruped, remove old filesErwin Coumans2019-05-3013-2297/+0
| * | | | remove unused varErwin Coumans2019-05-301-1/+0
| * | | | simplify previous commit do/while -> whileErwin Coumans2019-05-301-6/+2
|/ / / /
* | | | Merge pull request #2265 from akien-mga/dos2unixerwincoumans2019-05-3029-9147/+9147
|\ \ \ \
| * | | | Convert DOS (CRLF) source files to Unix (LF) line endingsRĂ©mi Verschelde2019-05-2229-9147/+9147
* | | | | Merge pull request #2263 from erwincoumans/mastererwincoumans2019-05-3015-10/+2312
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix loadMJCF/BulletMJCFImporter to load from fileIOErwin Coumans2019-05-291-9/+13
| * | | | revert to previous leg style of MicrotaurErwin Coumans2019-05-221-658/+714
| * | | | add toe endeffectors for IK of MicrotaurErwin Coumans2019-05-221-20/+271
| * | | | update microtaur URDF and example, to be compatible with minitaur_rainbow_dashErwin Coumans2019-05-222-763/+689
| * | | | added Microtaur URDF file, with basic system identificationErwin Coumans2019-05-2114-1/+2066
* | | | | Merge pull request #2257 from mtheall/mastererwincoumans2019-05-271-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Return at least 1 from btGetNumHardwareThreadsMichael Theall2019-05-161-2/+2
| |/ / /
* | | | Merge pull request #2258 from fuchuyuan/mastererwincoumans2019-05-161-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add safety checkChuyuan Fu2019-05-161-0/+1
|/ / /
* | | Merge pull request #2247 from erwincoumans/mastererwincoumans2019-05-082-3/+13
|\ \ \
| | | * Merge branch 'master' of https://github.com/erwincoumans/bullet3erwincoumans2019-05-09370-23927/+72064
| | | |\ | | |_|/ | |/| |
| * | | update pybullet versionErwin Coumans2019-05-081-1/+1
| * | | Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2019-05-083-44/+97
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2244 from erwincoumans/mastererwincoumans2019-05-082-0/+264
|\ \ \ \
* \ \ \ \ Merge pull request #2243 from crewmatt/mastererwincoumans2019-05-073-44/+97
|\ \ \ \ \
| * | | | | Update GRPC conversion of SDF and State Updatembennice2019-05-071-1/+20
| * | | | | Reduces wait in the gRPC plugin, fix state bug.mbennice2019-05-072-43/+77
|/ / / / /
* | | | | Merge pull request #2242 from erwincoumans/mastererwincoumans2019-05-071-3/+26
|\ \ \ \ \
| | | * | | fix test compilationErwin Coumans2019-05-081-2/+12
| | |/ / /
| | * | | Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2019-05-0715-18/+125
| | |\ \ \ | | |/ / / | |/| | |