diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e8a41182..2c968a713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.4) PROJECT(BULLET_PHYSICS) -SET(BULLET_VERSION 2.73) +SET(BULLET_VERSION 2.74) IF (NOT CMAKE_BUILD_TYPE) # SET(CMAKE_BUILD_TYPE "Debug") diff --git a/msvc/appAllBulletDemos.rc b/msvc/appAllBulletDemos.rc index b7b8d5c8f..db5145867 100644 --- a/msvc/appAllBulletDemos.rc +++ b/msvc/appAllBulletDemos.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "AllBulletDemos" #ifdef CS_DEBUG diff --git a/msvc/appBasicDemo.rc b/msvc/appBasicDemo.rc index 496352cf3..544040828 100644 --- a/msvc/appBasicDemo.rc +++ b/msvc/appBasicDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "BasicDemo" #ifdef CS_DEBUG diff --git a/msvc/appBenchmarks.rc b/msvc/appBenchmarks.rc index ad747a542..ecb51b087 100644 --- a/msvc/appBenchmarks.rc +++ b/msvc/appBenchmarks.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "Benchmarks" #ifdef CS_DEBUG diff --git a/msvc/appBspDemo.rc b/msvc/appBspDemo.rc index fdacb4f59..7a904f486 100644 --- a/msvc/appBspDemo.rc +++ b/msvc/appBspDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "BspDemo" #ifdef CS_DEBUG diff --git a/msvc/appBulletDino.rc b/msvc/appBulletDino.rc index c095b1d6a..abceb143b 100644 --- a/msvc/appBulletDino.rc +++ b/msvc/appBulletDino.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "BulletDino" #ifdef CS_DEBUG diff --git a/msvc/appCcdPhysicsDemo.rc b/msvc/appCcdPhysicsDemo.rc index 65c0f1e1f..5c9861692 100644 --- a/msvc/appCcdPhysicsDemo.rc +++ b/msvc/appCcdPhysicsDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "CcdPhysicsDemo" #ifdef CS_DEBUG diff --git a/msvc/appCharacterDemo.rc b/msvc/appCharacterDemo.rc index 3e44c370b..579520880 100644 --- a/msvc/appCharacterDemo.rc +++ b/msvc/appCharacterDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "CharacterDemo" #ifdef CS_DEBUG diff --git a/msvc/appColladaDemo.rc b/msvc/appColladaDemo.rc index 5db2d1964..6272c4336 100644 --- a/msvc/appColladaDemo.rc +++ b/msvc/appColladaDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "ColladaDemo" #ifdef CS_DEBUG diff --git a/msvc/appCollisionDemo.rc b/msvc/appCollisionDemo.rc index 0a2375d5e..a53ea3cfe 100644 --- a/msvc/appCollisionDemo.rc +++ b/msvc/appCollisionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "CollisionDemo" #ifdef CS_DEBUG diff --git a/msvc/appCollisionInterfaceDemo.rc b/msvc/appCollisionInterfaceDemo.rc index 4b611b8e3..4c51f45ae 100644 --- a/msvc/appCollisionInterfaceDemo.rc +++ b/msvc/appCollisionInterfaceDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "CollisionInterfaceDemo" #ifdef CS_DEBUG diff --git a/msvc/appConcaveDemo.rc b/msvc/appConcaveDemo.rc index 586ade6a2..ba5667bde 100644 --- a/msvc/appConcaveDemo.rc +++ b/msvc/appConcaveDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "ConcaveDemo" #ifdef CS_DEBUG diff --git a/msvc/appConstraintDemo.rc b/msvc/appConstraintDemo.rc index de6732ea8..3853efa79 100644 --- a/msvc/appConstraintDemo.rc +++ b/msvc/appConstraintDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "ConstraintDemo" #ifdef CS_DEBUG diff --git a/msvc/appContinuousConvexCollision.rc b/msvc/appContinuousConvexCollision.rc index 8bd5d4df2..81b89c713 100644 --- a/msvc/appContinuousConvexCollision.rc +++ b/msvc/appContinuousConvexCollision.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "ContinuousConvexCollision" #ifdef CS_DEBUG diff --git a/msvc/appConvexDecompositionDemo.rc b/msvc/appConvexDecompositionDemo.rc index 9a5a0f96d..03645eab0 100644 --- a/msvc/appConvexDecompositionDemo.rc +++ b/msvc/appConvexDecompositionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "ConvexDecompositionDemo" #ifdef CS_DEBUG diff --git a/msvc/appDoublePrecisionDemo.rc b/msvc/appDoublePrecisionDemo.rc index db79a870e..96d2a0a43 100644 --- a/msvc/appDoublePrecisionDemo.rc +++ b/msvc/appDoublePrecisionDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "DoublePrecisionDemo" #ifdef CS_DEBUG diff --git a/msvc/appEPAPenDepthDemo.rc b/msvc/appEPAPenDepthDemo.rc index 445ca471f..9efbb9508 100644 --- a/msvc/appEPAPenDepthDemo.rc +++ b/msvc/appEPAPenDepthDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "EPAPenDepthDemo" #ifdef CS_DEBUG diff --git a/msvc/appForkLiftDemo.rc b/msvc/appForkLiftDemo.rc index d2df65e11..328bf276f 100644 --- a/msvc/appForkLiftDemo.rc +++ b/msvc/appForkLiftDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "ForkLiftDemo" #ifdef CS_DEBUG diff --git a/msvc/appGenericJointDemo.rc b/msvc/appGenericJointDemo.rc index d5832e4c0..2f2050c1a 100644 --- a/msvc/appGenericJointDemo.rc +++ b/msvc/appGenericJointDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "GenericJointDemo" #ifdef CS_DEBUG diff --git a/msvc/appGimpactTestDemo.rc b/msvc/appGimpactTestDemo.rc index 11542a853..73bd0f5da 100644 --- a/msvc/appGimpactTestDemo.rc +++ b/msvc/appGimpactTestDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "GimpactTestDemo" #ifdef CS_DEBUG diff --git a/msvc/appGjkConvexCastDemo.rc b/msvc/appGjkConvexCastDemo.rc index 56ef24358..9e454242e 100644 --- a/msvc/appGjkConvexCastDemo.rc +++ b/msvc/appGjkConvexCastDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "GjkConvexCastDemo" #ifdef CS_DEBUG diff --git a/msvc/appHeightFieldFluidDemo.rc b/msvc/appHeightFieldFluidDemo.rc index 0ec01bc0d..3f7e7b87a 100644 --- a/msvc/appHeightFieldFluidDemo.rc +++ b/msvc/appHeightFieldFluidDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "HeightFieldFluidDemo" #ifdef CS_DEBUG diff --git a/msvc/appHelloWorld.rc b/msvc/appHelloWorld.rc index 4e2467043..21f6df10c 100644 --- a/msvc/appHelloWorld.rc +++ b/msvc/appHelloWorld.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "HelloWorld" #ifdef CS_DEBUG diff --git a/msvc/appMovingConcaveDemo.rc b/msvc/appMovingConcaveDemo.rc index ba8b33517..7ac8196e1 100644 --- a/msvc/appMovingConcaveDemo.rc +++ b/msvc/appMovingConcaveDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "MovingConcaveDemo" #ifdef CS_DEBUG diff --git a/msvc/appMultiMaterialDemo.rc b/msvc/appMultiMaterialDemo.rc index 48e0899fb..a5a783764 100644 --- a/msvc/appMultiMaterialDemo.rc +++ b/msvc/appMultiMaterialDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "MultiMaterialDemo" #ifdef CS_DEBUG diff --git a/msvc/appMultiThreadedDemo.rc b/msvc/appMultiThreadedDemo.rc index 4f075d24a..24601fdcf 100644 --- a/msvc/appMultiThreadedDemo.rc +++ b/msvc/appMultiThreadedDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "MultiThreadedDemo" #ifdef CS_DEBUG diff --git a/msvc/appRagdollDemo.rc b/msvc/appRagdollDemo.rc index fbcb21fed..ba996429f 100644 --- a/msvc/appRagdollDemo.rc +++ b/msvc/appRagdollDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "RagdollDemo" #ifdef CS_DEBUG diff --git a/msvc/appRaytracer.rc b/msvc/appRaytracer.rc index df87244be..34bda1a0f 100644 --- a/msvc/appRaytracer.rc +++ b/msvc/appRaytracer.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "Raytracer" #ifdef CS_DEBUG diff --git a/msvc/appSimplexDemo.rc b/msvc/appSimplexDemo.rc index fb80dd4e9..79020e0ba 100644 --- a/msvc/appSimplexDemo.rc +++ b/msvc/appSimplexDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "SimplexDemo" #ifdef CS_DEBUG diff --git a/msvc/appSliderConstraintDemo.rc b/msvc/appSliderConstraintDemo.rc index 811540190..83fe80df2 100644 --- a/msvc/appSliderConstraintDemo.rc +++ b/msvc/appSliderConstraintDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "SliderConstraintDemo" #ifdef CS_DEBUG diff --git a/msvc/appSoftBodyDemo.rc b/msvc/appSoftBodyDemo.rc index 06e75a099..d6edd8296 100644 --- a/msvc/appSoftBodyDemo.rc +++ b/msvc/appSoftBodyDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "SoftBodyDemo" #ifdef CS_DEBUG diff --git a/msvc/appTerrainDemo.rc b/msvc/appTerrainDemo.rc index 84966c49e..773da3f47 100644 --- a/msvc/appTerrainDemo.rc +++ b/msvc/appTerrainDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "TerrainDemo" #ifdef CS_DEBUG diff --git a/msvc/appUserCollisionAlgorithm.rc b/msvc/appUserCollisionAlgorithm.rc index 5ced8bdff..b39764a48 100644 --- a/msvc/appUserCollisionAlgorithm.rc +++ b/msvc/appUserCollisionAlgorithm.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "UserCollisionAlgorithm" #ifdef CS_DEBUG diff --git a/msvc/appVehicleDemo.rc b/msvc/appVehicleDemo.rc index 12a8e1ae0..7ef5a8f0f 100644 --- a/msvc/appVehicleDemo.rc +++ b/msvc/appVehicleDemo.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "VehicleDemo" #ifdef CS_DEBUG diff --git a/msvc/appiffCheck.rc b/msvc/appiffCheck.rc index b80eeda1b..e20e2238f 100644 --- a/msvc/appiffCheck.rc +++ b/msvc/appiffCheck.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "iffCheck" #ifdef CS_DEBUG diff --git a/msvc/appiffCreateTest.rc b/msvc/appiffCreateTest.rc index 9022d33cb..93e7bef01 100644 --- a/msvc/appiffCreateTest.rc +++ b/msvc/appiffCreateTest.rc @@ -1,8 +1,8 @@ // This file is generated automatically. 1 VERSIONINFO -FILEVERSION 2, 73, 0, 0 -PRODUCTVERSION 2, 73, 0, 0 +FILEVERSION 2, 74, 0, 0 +PRODUCTVERSION 2, 74, 0, 0 #ifdef CS_DEBUG FILEFLAGS 0x1 #else @@ -14,8 +14,8 @@ FILEFLAGS 0x0 BLOCK "040904E4" { VALUE "ProductName", "Bullet Continuous Collision Detection and Physics Library" - VALUE "ProductVersion", "2.73" - VALUE "FileVersion", "2.73" + VALUE "ProductVersion", "2.74" + VALUE "FileVersion", "2.74" VALUE "LegalCopyright", "Copyright (c) 2005-2008 Erwin Coumans" VALUE "FileDescription", "iffCreateTest" #ifdef CS_DEBUG diff --git a/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp index 5860d7bb4..6cbfe61f7 100644 --- a/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp +++ b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp @@ -508,7 +508,7 @@ void btGeneric6DofConstraint::getInfo1 (btConstraintInfo1* info) } } //test angular limits - for (int i=0;i<3 ;i++ ) + for (i=0;i<3 ;i++ ) { if(testAngularLimitMotor(i)) { diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index 6a28b2255..5180e0ba0 100644 --- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -398,9 +398,9 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol { int totalNumRows = 0; - + int i; //calculate the total number of contraint rows - for (int i=0;igetInfo1(&info1); if (info1.m_numConstraintRows) @@ -437,7 +437,8 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol btSolverBody* bodyAPtr = &m_tmpSolverBodyPool[solverBodyIdA]; btSolverBody* bodyBPtr = &m_tmpSolverBodyPool[solverBodyIdB]; - for (int j=0;jgetInfo2(&info2); ///finalize the constraint setup - for (int j=0;j