nicolaichuk
2466df1c5a
Merge branch 'Branch_2.86.1'
2017-03-29 18:21:42 +03:00
nicolaichuk
a359262678
remove redefine warning_message
2017-03-29 18:21:08 +03:00
nicolaichuk
f30464ebcb
Revert "add compare operators in btAABB"
...
This reverts commit 18f17be47d .
2017-03-29 18:20:36 +03:00
nicolaichuk
ae07ce2ea7
* add BT_USE_INVERSE_DYNAMICS_WITH_BULLET2
2017-03-29 17:11:26 +03:00
nicolaichuk
34228bb355
Merge branch 'Branch_2.86.1'
2017-03-23 17:48:23 +03:00
nicolaichuk
f68f821c89
rename Sructs to Structs
2017-03-23 17:47:44 +03:00
nicolaichuk
6063027181
fix "warning '<': signed/unsigned mismatch"
2017-03-23 15:24:27 +03:00
nicolaichuk
5144949ed8
add BT_USE_INVERSE_DYNAMICS_WITH_BULLET2
2017-03-23 15:17:29 +03:00
nicolaichuk
71e411c2ca
fix warning "This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library"
2017-03-23 14:38:45 +03:00
nicolaichuk
5527e36139
Merge remote-tracking branch 'remotes/bulletphysics/master'
...
# Conflicts:
# src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h
2017-03-23 14:28:49 +03:00
nicolaichuk
8e1b146568
Merge branch 'Branch_2.86.1'
2017-03-23 14:24:32 +03:00
nicolaichuk
6decb7ad1a
fix define call
2017-03-23 14:23:13 +03:00
nicolaichuk
703e66727c
irr_simd_memcpy to gim_simd_memcpy
2017-03-23 14:22:18 +03:00
nicolaichuk
18f17be47d
add compare operators in btAABB
2017-03-23 14:21:49 +03:00
nicolaichuk
bbf54cb05c
remove inline in function definition
2017-03-23 14:20:58 +03:00
nicolaichuk
233dd51e02
update CMakeLists.txt
2017-03-23 14:19:13 +03:00
nicolaichuk
d26952acac
add additional callback
2017-03-23 14:18:50 +03:00
nicolaichuk
1897939ec7
remove unimplemented method
2017-03-23 14:17:57 +03:00
nicolaichuk
3bf2f107b2
add default constructor
2017-03-23 14:17:13 +03:00
nicolaichuk
db065b8af8
fix redefinition
2017-03-23 14:15:51 +03:00
nicolaichuk
74b1044a05
move constructor for abstract class in protected
2017-03-23 14:14:14 +03:00
nicolaichuk
9360f1dca2
"btGImpactQuantizedBvh.h" divided into two files "btGImpactQuantizedBvh.h" and "btGImpactQuantizedBvhSructs.h"
2017-03-23 14:11:55 +03:00
nicolaichuk
3472a61216
"btGImpactBvh.h" divided into two files "btGImpactBvh.h" and "btGImpactBvhSructs.h"
2017-03-23 14:11:02 +03:00
nicolaichuk
b859ad7e4f
"btContactProcessing.h" divided into two files "btContactProcessing.h" and "btContactProcessingSructs.h"
2017-03-23 14:10:17 +03:00
nicolaichuk
c7834e8e25
"btAxisSweep3.h" divided into two files "btAxisSweep3.h" and "btAxisSweep3Internal.h"
2017-03-23 14:08:54 +03:00
erwincoumans
59fcf7ca24
Merge pull request #1034 from erwincoumans/master
...
:%s/STL/stl/g for Bullet/data/MPL/MPL.xml
2017-03-21 18:13:11 -07:00
Erwin Coumans
f498670798
:%s/STL/stl/g for Bullet/data/MPL/MPL.xml
2017-03-21 18:10:50 -07:00
erwincoumans
049d9a5ca6
Update OpenGLExampleBrowser.cpp
...
revert original width/height to 1024x768
2017-03-21 17:41:11 -07:00
erwincoumans
a30b887595
Merge pull request #1025 from olegklimov/master
...
URDF loader improvement 2
2017-03-21 17:12:22 -07:00
erwincoumans
2b698688f4
Merge pull request #1033 from erwincoumans/master
...
update pybullet quickstart guide to latest from
2017-03-21 17:08:09 -07:00
Oleg Klimov
80a0b51a1d
MJCF: fix cylinders in MJCF, also (possibly) fixes capsules in tiny renderer
2017-03-22 00:36:28 +03:00
erwin coumans
269909891a
update pybullet quickstart guide to latest from
...
https://docs.google.com/document/d/10sXEhzFRSnvFcl3XxNGhnD4N2SedqwdAvK3dsihxVUA/edit#
2017-03-21 14:25:35 -07:00
erwincoumans
b8b3633008
Merge pull request #1032 from erwincoumans/master
...
minor fix in friction anchors for btMultiBody
2017-03-21 11:49:42 -07:00
Erwin Coumans
61b28621ea
minor fix in friction anchors for btMultiBody
2017-03-21 09:24:00 -07:00
erwincoumans
8a1563428a
Merge pull request #1031 from erwincoumans/master
...
fix issue introduced in previous commit, related to
2017-03-20 21:08:33 -07:00
Erwin Coumans
0c874aa43a
fix issue introduced in previous commit, related to
...
btMultiBodyConstraintSolver friction/penetration handling
2017-03-20 19:38:59 -07:00
erwincoumans
cb08d077f0
Merge pull request #1030 from erwincoumans/master
...
friction anchors, arm64 premake
2017-03-20 11:48:44 -07:00
erwincoumans
3532762cdc
Merge pull request #1029 from YunfeiBai/master
...
Minor modifications related to gripper.
2017-03-20 11:03:31 -07:00
Erwin Coumans
0b017b0f53
fix issue with btMultiBody friction in combination with soft contacts (friction should not re-use normal contact cfm/erp)
...
implement friction anchors, position friction correction, disabled by default. Use colObj->setCollisionFlag(flag | CF_HAS_FRICTION_ANCHOR); See test/RobotClientAPI/SlopeFrictionMain.cpp. In URDF or SDF, add <friction_anchor/> in <contact> section of <link> to enable.
PhysicsServer: properly restore old activation state after releasing picked object
btMultiBodyConstraintSolver: disable flip/flop of contact/friction constraint solving by default (it breaks some internal flaky unit tests)
2017-03-20 10:58:07 -07:00
yunfeibai
753f1d3d2f
Add lateral and spinning friction coefficients to gripper sdf model.
2017-03-20 10:16:15 -07:00
yunfeibai
6695268fba
Fix the issue with indentation in pr2 setup.
2017-03-20 09:52:24 -07:00
Oleg Klimov
41df15a464
MJCF: fix B3_PI, fix colors, fix capsule without 'fromto'
2017-03-19 00:19:04 +03:00
Erwin Coumans (Google)
865d37fcb5
add premake4_arm64 that works on NVIDIA TX2
2017-03-18 18:32:21 +00:00
Oleg Klimov
4526b0a94a
MJCF: support for default joint limited="true"
2017-03-18 04:10:07 +03:00
Oleg Klimov
fa7397cc92
Rename *.STL to *.stl for case-sensitive filesystems
2017-03-17 02:11:47 +03:00
Oleg Klimov
e8da7bb6f8
URDF loader: fix MuJoCo xml load, also closes #993
2017-03-17 02:11:47 +03:00
Erwin Coumans
32b9eacb34
fix compile issue
2017-03-16 13:26:44 -07:00
erwincoumans
86bec45247
Merge pull request #1024 from erwincoumans/master
...
expose video capture as logging command
2017-03-16 11:02:58 -07:00
erwincoumans
a89d3cfb95
Merge pull request #1019 from erikogenvik/kinematic_controller_initialization
...
Kinematic controller initialization
2017-03-16 10:54:41 -07:00
Erwin Coumans
f71a85621d
Merge remote-tracking branch 'bp/master'
2017-03-16 10:04:58 -07:00