Merge remote-tracking branch 'bp/master' into master

This commit is contained in:
Erwin Coumans
2020-11-17 23:21:02 -08:00
8 changed files with 275 additions and 144 deletions

View File

@@ -197,6 +197,7 @@ project "App_BulletExampleBrowser"
"../MultiBody/MultiBodySoftContact.cpp",
"../MultiBody/MultiBodyConstraintFeedback.cpp",
"../MultiBody/InvertedPendulumPDControl.cpp",
"../MultiBody/KinematicMultiBodyExample.cpp",
"../RigidBody/RigidBodySoftContact.cpp",
"../RigidBody/KinematicRigidBodyExample.cpp",
"../ThirdPartyLibs/stb_image/stb_image.cpp",