Commit Graph
3455 Commits
Author SHA1 Message Date
erwincoumans 43304f494e Merge pull request #249 from erwincoumans/master
fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS
2014-09-17 10:08:34 -07:00
Erwin Coumans 76f4bd9a9d fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS 2014-09-17 10:07:21 -07:00
erwincoumans 065091bd12 Merge pull request #248 from erwincoumans/master
fix btInMemorySerializer but disable btInMemorySerializer by default
2014-09-16 20:17:51 -07:00
Erwin Coumans 4352eb1ea4 disable btInMemorySerializer by default 2014-09-16 20:16:01 -07:00
Erwin Coumans 1fccfc4e28 fix btInMemorySerializer 2014-09-16 20:14:31 -07:00
erwincoumans dd526e7da9 Merge pull request #247 from erwincoumans/master
disable btInMemorySerializer by default
2014-09-16 19:57:11 -07:00
Erwin Coumans ad251da294 disable btInMemorySerializer by default 2014-09-16 19:56:26 -07:00
erwincoumans 26a8eee4ad Merge pull request #246 from erwincoumans/master
add btInMemorySerializer (experiments, allows for in-memory deep copy of...
2014-09-16 19:40:58 -07:00
Erwin Coumans f9eb7c68c5 add btInMemorySerializer (experiments, allows for in-memory deep copy of worlds, bypassing the BulletFileLoader mechanism)
add btCollisionWorldImporter that can load a .bullet file, or use the btInMemorySerializer for deep-copy
2014-09-16 19:18:10 -07:00
erwincoumans baeec0efcd Merge pull request #245 from erwincoumans/master
split Wavefront .obj to graphics conversion in a reusable file (Wavefron...
2014-09-16 14:23:46 -07:00
= f395a5d031 split Wavefront .obj to graphics conversion in a reusable file (Wavefront2GLInstanceGraphicsShape.*) 2014-09-16 14:22:09 -07:00
erwincoumans 11db92bfbc Merge pull request #243 from erwincoumans/master
minor cleanup of btgui/demo3 stuff, much more demo cleanup is needed
2014-09-16 12:31:17 -07:00
Erwin Coumans 07e2dcc749 minor cleanup of btgui/demo3 stuff, much more demo cleanup is needed
moved some files in btgui/Bullet3AppSupport
2014-09-16 12:08:24 -07:00
erwincoumans 3240d790e4 Update btSerializer.h
fix compile error in LinearMath/btSerializer.h
2014-09-16 09:32:26 -07:00
erwincoumans 89aeae9102 Add serialization support for btGeneric6DofSpring2Constraint
Attempt to re-order serialization data so it can be serialized in-memory (for deep copy)
2014-09-16 09:22:35 -07:00
erwincoumans 11ded54a04 call 'updateCamera' in GpuDemos. 2014-09-12 09:51:01 -07:00
erwincoumans 4403ecf49d AMD 14.50Alpha5 driver fixes the issue with MPR kernel, re-enable testFileFracture.bullet 2014-09-12 09:50:13 -07:00
xantares 8b8e3d3a1f Update CMakeLists.txt
does not build on win32
2014-09-11 18:56:59 +02:00
erwincoumans 02ca31bc9d Merge pull request #240 from erwincoumans/master
allow to compile using gcc-4.x on Mac OSX
2014-09-10 20:51:07 -07:00
Erwin Coumans 6406519108 allow to compile using gcc-4.x on Mac OSX 2014-09-10 20:50:12 -07:00
erwincoumans 46565f3cea Merge pull request #238 from erwincoumans/master
premake: use *.cpp insteadl of **.cpp
2014-09-05 11:32:22 -07:00
Erwin Coumans a26f9c1871 premake: use *.cpp insteadl of **.cpp 2014-09-05 11:22:25 -07:00
erwincoumans 3205f71e5e Merge pull request #237 from erwincoumans/master
escape quits SimpleOpenGLApp
2014-09-04 18:00:44 -07:00
Erwin Coumans 61808844de escape quits SimpleOpenGLApp 2014-09-04 17:54:33 -07:00
erwincoumans b125a96294 Merge pull request #232 from erwincoumans/master
consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueType...
2014-09-03 10:21:02 -07:00
Erwin Coumans 0125324bd6 consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueTypeFont)
consolidate stringify_linux/_osx into stringify.sh
2014-09-03 09:52:31 -07:00
erwincoumans d6c78426bd Merge pull request #231 from erwincoumans/master
stringify unified between linux and mac
2014-09-01 09:30:34 -07:00
Erwin Coumans (Google) 58d7a7b9d5 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2014-09-01 09:21:26 -07:00
Erwin Coumans (Google) e20c240178 make stringify_linux.sh compatible with mac osx (testing) 2014-09-01 09:17:21 -07:00
erwincoumans 3b7a7007ce Merge pull request #230 from erwincoumans/master
remove BUILD_MULTITHREADING option from CMakeLists.txt
2014-08-31 13:10:11 -07:00
Erwin Coumans 701ce71a1e remove BUILD_MULTITHREADING option from CMakeLists.txt 2014-08-31 13:09:20 -07:00
erwincoumans 57b3886c1f Merge pull request #229 from erwincoumans/master
add fileOpenDialog selector (Win/Mac/Linux), CMake remote CMAKE_INSTALL_PREFIX,fix support for dynamic loading of X11 functions
2014-08-31 13:01:22 -07:00
Erwin Coumans 6f302f8a6f Merge remote-tracking branch 'bp/master' 2014-08-31 12:56:40 -07:00
Erwin Coumans da8abf443e fix support for dynamic loading of X11 functions, after adding XRaiseWindow
./premake4_linux64 --force_dlopen_x11 gmake
2014-08-31 12:51:11 -07:00
Erwin Coumans ec3650acc4 CMake: remove CMAKE_INSTALL_PREFIX from CMakeLists.txt it is automagically used
See also https://github.com/bulletphysics/bullet3/pull/227
remove pthread from OpenGL/GlutStuff.cpp for now (it breaks CMake build)
2014-08-31 12:36:02 -07:00
Erwin Coumans f199a4a972 add fileOpenDialog and enable loading of urdf from GUI
(will add .bullet file support soon)
Uses native Windows (getFileOpenFileName) and Mac OSX NSOpenPanel,
on Linux using pipe popen to zenity)
2014-08-31 11:53:44 -07:00
erwincoumans 6760cee950 Merge pull request #224 from erwincoumans/master
update badges in README.md
2014-08-28 23:20:03 -07:00
Erwin Coumans 8595928949 update appveyor badge 2014-08-28 23:02:19 -07:00
Erwin Coumans 145123260c update badges for README.md 2014-08-28 22:58:10 -07:00
Erwin Coumans 81bafacca1 rename to see if travis message works with .md extension? 2014-08-28 22:50:28 -07:00
erwincoumans 613beab593 Update readme.txt
attempt to get travis results in readme
2014-08-28 22:37:04 -07:00
erwincoumans 09e758b9e5 Update appveyor.yml
aaargh, trial-and-error appveyor scripting
2014-08-28 22:27:24 -07:00
erwincoumans 4004ab4dbc Update appveyor.yml
aargh, a few more examples how to use simple cmd use would help, please appveyor
2014-08-28 22:26:17 -07:00
erwincoumans 7c4a5fc311 Update appveyor.yml 2014-08-28 22:17:22 -07:00
erwincoumans 8f27aaa5df Update appveyor.yml 2014-08-28 22:05:40 -07:00
erwincoumans d0d6de121c Update appveyor.yml 2014-08-28 22:04:46 -07:00
erwincoumans aa8c1e9270 Create appveyor.yml
test script for appveyor
2014-08-28 21:42:11 -07:00
erwincoumans a51382e13b Merge pull request #223 from erwincoumans/master
add 'fixed' joint for btMultiBody
2014-08-28 19:13:44 -07:00
erwin coumans dc16655d35 more bug fixes 2014-08-28 19:01:56 -07:00
erwin coumans 0dff61fbe0 fix two compile errors, thanks to Travis
https://travis-ci.org/bulletphysics/bullet3/jobs/33858712
2014-08-28 18:53:51 -07:00