summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Cmake pybullet fix"revert-1331-cmakeerwincoumans2017-09-232-30/+8
* Merge pull request #1327 from erwincoumans/mastererwincoumans2017-09-2117-513/+3768
|\
| * add B3_SHARED_API to the remaining PhysicsClientC_API APIsErwin Coumans2017-09-218-478/+478
| * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-09-2132-133/+12688
| |\
| | * add B3_SHARED_API definition for Mac / Linux / gccErwin Coumans2017-09-211-1/+5
| | * Quick first prototype/test to integrate pybullet into Unity,erwincoumans2017-09-2010-76/+3324
| * | re-update the VR cameraErwin Coumans2017-09-211-0/+3
* | | Merge pull request #1331 from ahundt/cmakeerwincoumans2017-09-212-8/+30
|\ \ \
| * | | cmake python fix typos for linux #1322Andrew Hundt2017-09-211-3/+3
| * | | cmake python fix for linux #1322Andrew Hundt2017-09-212-9/+31
|/ / /
* | | Merge pull request #1325 from erwincoumans/mastererwincoumans2017-09-2022-57/+9360
|\ \ \ | | |/ | |/|
| * | more fixes for retina + glfw + opengl2 fallbackErwin Coumans2017-09-208-38/+59
| * | support retina / scale factor between pixel size and screen coordinate sizeErwin Coumans2017-09-204-11/+24
| * | fix Windows build for premakeErwin Coumans2017-09-201-2/+2
| * | allow to configure glfw on Mac OSX, disabled by defaultErwin Coumans2017-09-202-3/+39
| * | minor fixes in GLFWOpenGLWindowerwincoumans2017-09-192-4/+3
| * | add GLFWOpenGLWindow and glad (replacement for glew)erwincoumans2017-09-196-0/+9132
| * | Merge branch 'master' of https://github.com/erwincoumans/bullet3erwincoumans2017-09-192-19/+4
| |\ \ | | |/
| * | enable option to use GLFW, instead of our own cross-platform X11/Cocoa/Window...erwincoumans2017-09-1911-25/+127
* | | Merge pull request #1323 from erwincoumans/mastererwincoumans2017-09-192-19/+4
|\ \ \ | | |/ | |/|
| * | revert to FIND_PACKAGE(PythonLibs), the new solution doesn't work with TravisErwin Coumans2017-09-191-17/+2
| * | try to re-enable continuous integrationErwin Coumans2017-09-191-1/+1
| * | disable NUMPY build by defaultErwin Coumans2017-09-181-1/+1
| * | attempt to re-enable pybullet in cmakeErwin Coumans2017-09-181-1/+1
| |/
* | Merge pull request #1318 from erwincoumans/mastererwincoumans2017-09-177-7/+15
|\ \ | |/
| * fix loading of empty file (after header)erwincoumans2017-09-172-1/+3
| * fix rendering ("rgb_array") for pendulums/pendulaErwin Coumans2017-09-152-2/+6
| * fix issue with rendering of certain capsules from MJCF files.erwincoumans2017-09-151-1/+2
| * Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-09-1511-46/+31
| |\
| * | fix pybullet gym environments: InvertedDoublePendulumBulletEnv-v0,Erwin Coumans2017-09-152-7/+5
* | | Merge pull request #1317 from erwincoumans/mastererwincoumans2017-09-144-15/+4
|\ \ \ | | |/ | |/|
| * | pybullet/C-API: fix width/height when getCameraImage has a fallback from Open...Erwin Coumans2017-09-141-12/+3
| * | remove some warning ,see also Pull Request #302Erwin Coumans2017-09-143-3/+1
|/ /
* | Merge pull request #1289 from lolengine/fix-one-sided-softbodieserwincoumans2017-09-141-2/+2
|\ \
| * | Fix one-sided soft bodies.Sam Hocevar2017-09-011-2/+2
* | | Merge pull request #1308 from benelot/fix-gymserwincoumans2017-09-144-31/+24
|\ \ \
| * | | Enable randomized reset for Humanoid.Benelot2017-09-141-17/+19
| * | | Remove tweaks added by me but not part of roboschool.Benelot2017-09-143-14/+5
* | | | Merge pull request #1315 from erwincoumans/mastererwincoumans2017-09-141-1/+2
|\ \ \ \
| * | | | fix pybullet, checked wrong type after connectionErwin Coumans2017-09-131-1/+2
* | | | | Merge pull request #1314 from erwincoumans/mastererwincoumans2017-09-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | fix return values in pybullet to be Pythonic.Erwin Coumans2017-09-131-1/+1
* | | | | Merge pull request #1313 from erwincoumans/mastererwincoumans2017-09-1315-23/+87
|\ \ \ \ \ | |/ / / /
| * | | | remove a debug printfErwin Coumans2017-09-131-1/+0
| * | | | Merge remote-tracking branch 'bp/master'Erwin Coumans2017-09-130-0/+0
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Merge pull request #1311 from erwincoumans/mastererwincoumans2017-09-123-22/+78
|\ \ \ \
* \ \ \ \ Merge pull request #1307 from erwincoumans/mastererwincoumans2017-09-1118-46/+150
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | | * | Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-09-131-1/+6
| | | |\ \
| | | | * \ Merge branch 'master' of https://github.com/erwincoumans/bullet3Erwin Coumans2017-09-133-22/+78
| | | | |\ \ | | | |_|/ / | | |/| | |
| | | | * | remove memory of loadTexture.Erwin Coumans2017-09-131-1/+6
| | |_|/ / | |/| | |