Commit Graph

293 Commits

Author SHA1 Message Date
Daniel Genrich
96408da81a Added bullet back to branch, compiling works again 2008-05-07 20:22:28 +00:00
Daniel Genrich
3a36304bd9 Resolved other bad files in branch, had to kick old bullet, will have to copy from trunk 2008-05-07 20:06:28 +00:00
Daniel Genrich
57932e1752 svn merge -r 13452:14721 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-05-07 17:44:46 +00:00
Nathan Letwory
ada5f0403e * Fix Verse bug [#8959] Clients doesn't connect if libverse.a is compiled with -O2
Merged from Verse SVN (r4524). See Verse bug tracker for bug report.
2008-04-30 22:42:12 +00:00
Brecht Van Lommel
2706c62231 Fix for bug #9504: compile error with verse on mingw, also fixed
in verse svn.
2008-04-28 11:05:01 +00:00
Peter Schlaile
f80089c753 == FFMPEG / mp3lame ==
Added libmp3lame to extern. (Ton that was the last one for this release,
promised :) )
2008-04-20 16:28:21 +00:00
Chris Want
5d0a207ecb Patch from GSR that a) fixes a whole bunch of GPL/BL license
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Peter Schlaile
4fc95e77b1 == FFMPEG ==
Added XVid to trunk. Again: only works with scons.
2008-04-13 17:45:56 +00:00
Peter Schlaile
747b31385a == FFMPEG ==
Added H264-encoding support using libx264.

Beware: it currently only works with scons and it needs nasm or yasm as
an additional dependency!
2008-04-13 15:17:06 +00:00
Chris Want
1108075316 Set linking priority of libbinreloc to 226 for blenderplayer. Why?
Because libblenkernel_blc, which depends on binreloc, has priority
225.
2008-02-15 16:52:20 +00:00
Ken Hughes
05152b7db0 Missed reverting one extra assignment. 2008-02-03 02:09:06 +00:00
Ken Hughes
0a27a31970 Clean-up for various gcc warnings under linux. 2008-02-03 01:33:35 +00:00
Andrea Weikert
c773988003 == MSVC 7.1 projectfiles ==
- added missing files from cloth sim
2008-01-30 20:19:40 +00:00
Daniel Genrich
fd877543d1 New: Collision Modifier and Cloth can be at any position on the modifier stack. BUT everytime the vertices count change, they will free themselves and internal build new (they rely on vertex count). Should be no problem anymore with e.g. subsurf modifier before collision modifier (tested). Fix: applied a patch from schlaile to get my bullet additions compiled with gcc 3.3 2008-01-30 14:01:05 +00:00
Daniel Genrich
7a7a52226f makes bullet independant from gameengine for cmake, introduces esc-key during sim, disables collisions when no bullet there 2008-01-29 23:13:31 +00:00
Daniel Genrich
77685023ca Initial commit of cloth modifier from branch rev 13453 2008-01-29 21:01:12 +00:00
Daniel Genrich
d623e52afd svn merge -r 13323:13357 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-01-22 20:35:37 +00:00
Chris Want
659316e4f4 Fixes for CMake. 2008-01-22 05:34:53 +00:00
Daniel Genrich
ddef077b38 svn merge -r 13240:13323 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-01-21 02:42:42 +00:00
Kent Mein
320ac3f0e2 Fixing makefiles for binreloc I made it use flags like other
things default on for linux.  ideasman helped me get scons working.
Cmake still needs some love...

Kent
2008-01-18 21:39:47 +00:00
Campbell Barton
09c2fd6f11 Linux only addition to know for sure the path of blender because sometimes the Play button doesn't work depending on how blender is started.
This uses binreloc - http://autopackage.org/docs/binreloc/
it should also solve the problem of python scripts not being found.
2008-01-18 15:10:17 +00:00
Daniel Genrich
a9c36825aa svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-01-02 14:36:46 +00:00
Kent Mein
6135f97105 Need to propigate -m64 flags to compile verse.
Kent
2007-12-20 19:39:21 +00:00
Daniel Genrich
cf59579d44 svn merge -r 12716:12856 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2007-12-12 17:58:06 +00:00
Kent Mein
7b2e348d4f This is a modified version of this patch:
[#7660] Solaris 10 x86 support (Makefiles)

Hopefully it will not mess up anything for anyone else.  I removed
some hardcoded static libs and made NAN_*_LIB definitions so they could be 
overridden, to allow greater flexability.

Let me know if there are any problems/questions.

Kent
2007-12-05 16:58:52 +00:00
Daniel Genrich
c5d4e8a137 updating bullet 2007-11-06 14:26:08 +00:00
Daniel Genrich
e057b56d3b svn merge -r 12478:12495 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2007-11-06 12:10:59 +00:00
Kent Mein
86278584f3 Tweaks I needed to get blender compiling on my new macbook running leopard.
Kent
2007-11-05 17:27:11 +00:00
Daniel Genrich
b91cb25986 Merge with trunk: svn merge -r 12151:12179 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2007-10-01 21:36:39 +00:00
Daniel Genrich
777c16d444 Bullet is back, but now generalized enough to allow own distance/calculation. Some bullet makefile-fix by 'gsr b3d'- please test it. Also fixed some crasher with cache. Also implemented moving-collisions enabled kdop (response missing in the moment) 2007-10-01 20:19:22 +00:00
Peter Schlaile
5a9273dad1 == FFMPEG ==
External ffmpeg would have linked against both internal and external
libs.
2007-09-27 07:08:22 +00:00
Peter Schlaile
fb44c5825e == FFMPEG ==
Scons support for internal ffmpeg
2007-09-27 06:48:28 +00:00
Daniel Genrich
5b9140a209 Fixed some collision response issues. (weekend commit, some half done work in) 2007-09-21 13:34:19 +00:00
Daniel Genrich
f473f4ee79 Fix: No GAMEENGINE=1 needed anymore, only WITH_BF_BULLET=1.
Fix: (Hopefully) some fix for linking openmp
2007-09-17 21:03:45 +00:00
Daniel Genrich
cd998aaadd Initial checkin of cloth files + changes 2007-09-16 16:23:21 +00:00
Kent Mein
4e2143f639 This commit fixes up a bunch of svn properties to hopefully make things a little nicer for everyone.
Patch provied by gsrb3d

bug tracker #7061

Kent
2007-08-28 10:07:08 +00:00
Erwin Coumans
f0de3124ce reverted to old hinge constraint, it breaks several tests/demos 2007-08-05 17:44:32 +00:00
Jiri Hnidek
ee593409e3 updated scons build system, neccesary after erwin's commit 2007-07-16 09:09:01 +00:00
Andrea Weikert
f3c14b1306 == MSVC 7.1 project files ==
- updated bullet files with btConeTwistConstraint.h and btConeTwistConstraint.cpp
2007-07-15 16:28:25 +00:00
Erwin Coumans
71550bd3c6 removed "btHingeConstraint::" prefix, in btHingeConstraint::btHingeConstraint(btRigidBody& rbA,const btVector3& pivotInA,btVector3& axisInA); 2007-07-06 20:29:26 +00:00
Erwin Coumans
f256efdb34 fixed issue with kinematic objects 2007-07-06 04:30:25 +00:00
Erwin Coumans
376be529bb synchronized to latest version of Bullet. added btConeTwistConstraint (useful for ragdolls etc) 2007-07-06 03:12:31 +00:00
Kent Mein
fbabee6ccc Not all systems it seems has socklen_t defined. If its missing
typedef it as an int.

Kent
2007-06-26 18:40:41 +00:00
Kent Mein
bf4368a09e This is a fix for bug #6856 (Verse crashing on 64bit linux)
https://projects.blender.org/tracker/index.php?func=detail&aid=6856&group_id=9&atid=125

I basically fixed some warnings about imcompatable types on 64bit linux
and the crashing stopped.

Kent
2007-06-26 15:08:40 +00:00
Andrea Weikert
ddc68225c2 ==== MSVC 7.1 projectfiles ====
- bullet update to version 2.53 cleanup
- added file sculptmode-stroke.c
2007-06-25 17:51:37 +00:00
Kent Mein
dd0244aa11 Make it so that we link with the same compiler for verse as everything else.
(was using $(CC) while the rest of blender is using $(CCC)
2007-06-25 17:36:04 +00:00
Erwin Coumans
ca26aeb7b2 upgrade to latest Bullet 2.53. cross the fingers it doesn't break one of the exotic or less exotic platforms 2007-06-23 05:28:07 +00:00
Erwin Coumans
d814e2b9c6 two minor changes, hopefully before release:
- reset randseed, which should make simulations more predictable
- re-activate substeps (for more accurate simulations)
2007-05-07 17:10:44 +00:00
Stephen Swaney
981d24daa1 fix gcc warnings about no newline at end of file 2007-03-14 16:09:12 +00:00
Andrea Weikert
d1b17f8c30 ==== MSVC 7.1 project files ====
- fix for 3DPlugin compile
- cleanup of bullet path
- removed PHY_ODE project from 3D plugin too, not used anymore

Now all configurations should build again, let me know of any problems!

Not been able to test if the 3DPlugin is actually working,is job for another day ;)
Also the 3DPlugin is compiled without OpenExr, this needs to be looked into once too.
2007-03-03 11:28:15 +00:00