Merge pull request #3082 from erwincoumans/master

@erwincoumans bump up PyBullet and Bullet version to 3.05 (in sync for this release)
bulletphysics · Sep 24, 2020 · b12da62 · b12da62
2 parents 0c56317 + e454b90
commit b12da62
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Extras/Serialize/BulletFileLoader/autogenerated/bullet.h b/Extras/Serialize/BulletFileLoader/autogenerated/bullet.h
@@ -760,7 +760,6 @@ typedef struct bInvalidHandle {
         int m_restingContactRestitutionThreshold;
         int m_minimumSolverBatchSize;
         int m_splitImpulse;
-        char m_padding[4];
     };
 
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.89
+3.05
diff --git a/examples/pybullet/gym/pybullet_robots/laikago/laikago.py b/examples/pybullet/gym/pybullet_robots/laikago/laikago.py
@@ -6,6 +6,7 @@
 p.connect(p.GUI)
 p.setAdditionalSearchPath(pd.getDataPath())
 
+p.setPhysicsEngineParameter(enableConeFriction=0)
 plane = p.loadURDF("plane.urdf")
 p.setGravity(0, 0, -9.8)
 p.setTimeStep(1. / 500)

diff --git a/setup.py b/setup.py
@@ -501,7 +501,7 @@ def _single_compile(obj):
 
 setup(
     name='pybullet',
-    version='3.0.3',
+    version='3.0.5',
     description=
     'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
     long_description=

diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
@@ -25,7 +25,7 @@ subject to the following restrictions:
 #include <float.h>
 
 /* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
-#define BT_BULLET_VERSION 289
+#define BT_BULLET_VERSION 305
 
 inline int btGetVersion()
 {

diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h
@@ -479,9 +479,9 @@ class btDefaultSerializer : public btSerializer
 			buffer[8] = 'V';
 		}
 
-		buffer[9] = '2';
-		buffer[10] = '8';
-		buffer[11] = '9';
+		buffer[9] = '3';
+		buffer[10] = '0';
+		buffer[11] = '5';
 	}
 
 	virtual void startSerialization()