Commit Graph

5 Commits

Author SHA1 Message Date
erwin coumans
a59bedd745 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2014-10-22 14:47:07 -07:00
erwin coumans
1ce647742c fix build 2014-10-22 14:46:48 -07:00
Erwin Coumans
2965087110 remove unnecessary header 2014-10-21 18:06:36 -07:00
Erwin Coumans
bb9ea22bf0 fix mac build 2014-10-21 17:49:57 -07:00
erwin coumans
579b34d2e0 Added a basic COLLADA .dae importer mainly to support URDF loading (URDF can refer to COLLADA .dae or STL .stl for mesh support)
It is fairly limited, only supports loading <geometry> with triangulated meshes, no material loading
I will extend this with COLLADA Physics support.
2014-10-21 17:44:54 -07:00