 Erwin Coumans
|
811087b099
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
Conflicts:
btgui/OpenGLWindow/X11OpenGLWindow.cpp
|
2014-07-27 10:55:58 -07:00 |
|
|
Erwin Coumans
|
0b40e1a899
|
add upAxis option for Y or Z up
remove some warnings
|
2014-07-27 10:29:10 -07:00 |
|
|
Erwin Coumans
|
5e9102bf00
|
fix warnings in OpenGLTrueTypeFont
|
2014-07-27 10:25:36 -07:00 |
|
|
Erwin Coumans
|
87d44cbb74
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
|
2014-07-02 09:40:39 -07:00 |
|
|
Erwin Coumans
|
8e2a4f8171
|
dynamically switch between OpenGL 2 and OpenGL 3 (test gwen)
|
2014-06-30 14:42:11 -07:00 |
|
|
Erwin Coumans
|
05baa69fa9
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
|
2014-06-30 12:16:47 -07:00 |
|
|
Erwin Coumans
|
eecffab524
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
|
2014-06-27 12:06:54 -07:00 |
|
|
Erwin Coumans
|
16d759af6f
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
|
2014-06-24 20:44:35 -07:00 |
|
|
Erwin Coumans
|
4bace5ca7e
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
|
2014-06-24 20:27:40 -07:00 |
|
|
Erwin Coumans
|
fd7a2b3a17
|
Merge branch 'master' of https://github.com/bulletphysics/bullet3
|
2014-06-24 15:32:19 -07:00 |
|
|
Erwin Coumans
|
c1db34a046
|
enable B3G_RETURN for Mac OSX
|
2014-06-24 11:49:34 -07:00 |
|
|
Erwin Coumans
|
28f19f1bab
|
improve BasicDemo, better mouse handling, add colors to drawing
|
2014-05-21 09:59:24 -07:00 |
|
|
Erwin Coumans
|
7f300a877f
|
fix some btgui issues on Mac OSX
|
2014-05-20 14:43:19 -07:00 |
|
|
Erwin Coumans
|
4912bebfbf
|
fix linker error on Mac OSX
|
2014-05-20 14:07:57 -07:00 |
|
|
Erwin Coumans
|
1e2b907562
|
update version to 2.83 for an intermediate release (2014 will be a transition year to Bullet 3.x)
|
2014-05-16 16:20:07 -07:00 |
|
|
Erwin Coumans
|
46884e0f1f
|
update the binary premake4_osx binary, avoid the -Wl,-x flag so clang linker doesn't produce an error
ld: internal error: atom not found in symbolIndex
see http://industriousone.com/topic/how-remove-flags-ldflags
|
2014-05-16 16:11:59 -07:00 |
|
|
Erwin Coumans
|
e279aed08f
|
re-enable the fix for broken friction in Clang (got accidently undone in a recent commit)
fix OSX build
|
2014-05-03 10:11:49 -07:00 |
|
|
Erwin Coumans
|
66ab2a2022
|
fix OSX build
|
2014-05-03 08:48:46 -07:00 |
|
|
Erwin Coumans
|
907ac49892
|
work-around what appears to be a bug in Clang 3.4. Todo: create a small repro case for Clang/LLVM or see if they already fixed it.
|
2014-04-29 11:44:52 -07:00 |
|
|
Erwin Coumans
|
8eb1835415
|
fix a potential bug in CProfileNode destructor, if the SDK is included/used multiple times.
|
2014-04-28 11:24:29 -07:00 |
|
|
Erwin Coumans
|
4996a64238
|
fix CMake build on Mac OSX
|
2014-04-28 11:11:45 -07:00 |
|