projects
/
blender.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merged 2.5 -r 20124:21003
[blender.git]
/
extern
/
bullet2
/
src
/
SConscript
2009-06-16
Campbell Barton
small merge needed for testing new animsys in 2.5 BGE...
blob
|
commitdiff
|
raw
2009-06-16
Campbell Barton
changes to the sequencer in trunk between 20855:20928...
blob
|
commitdiff
|
raw
2009-06-16
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-06-13
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-06-13
Campbell Barton
merged from trunk 20741:20848
blob
|
commitdiff
|
raw
2009-06-08
Brecht Van Lommel
2.50:
blob
|
commitdiff
|
raw
2009-04-20
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
2009-03-17
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
2009-02-23
Martin Poirier
merging trunk 17520:19093
blob
|
commitdiff
|
raw
|
diff to current
2009-02-20
Nathan Letwory
2.5 / Scons | Building on 64bit Windows
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Nathan Letwory
SCons:
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
|
diff to current
2008-12-23
Nathan Letwory
2.5 / SCons
blob
|
commitdiff
|
raw
|
diff to current
2008-12-23
Nathan Letwory
2.5 / SCons
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Brecht Van Lommel
Merge of trunk into blender 2.5:
blob
|
commitdiff
|
raw
|
diff to current
2008-10-02
Martin Poirier
merge trunk 16118 -> 116886
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Andre Susano Pinto
Merge ... SimpleDeform modifier from soc-2008-jaguarand...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Brecht Van Lommel
Bullet build system fixes: add gimpact to the makefiles...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Joshua Leung
scons/mingw linking fixes with bullet - adjusting prior...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Nathan Letwory
* split collision lib into its subparts
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Erwin Coumans
Allow Bullet soft bodies to be created using a AddObjec...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Andre Susano Pinto
Merge from trunk
blob
|
commitdiff
|
raw
|
diff to current
2008-09-19
Andre Susano Pinto
Revert last merge from trunk
blob
|
commitdiff
|
raw
|
diff to current
2008-09-18
Daniel Genrich
svn merge -r 16454:16593 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-18
Campbell Barton
needed these changes to get bullet building with cmake...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Nathan Letwory
* make BulletSoftBody own small lib to make sure bullet...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-16
Erwin Coumans
add BulletSoftBody to SConscript and Makefile
blob
|
commitdiff
|
raw
|
diff to current
2008-09-15
Andre Susano Pinto
svn merge -r 16231:16536 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-12
Daniel Genrich
merging bullet 2.71 to trunk --> svn merge -r16334...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-12
Daniel Genrich
svn merge -r 16453:16485 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-10
Daniel Genrich
svn merge -r 16411:16453 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-07
Daniel Genrich
svn merge -r 16396:16411 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-07
Daniel Genrich
Some version were not merged from svn/missing --> svn...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-06
Benoit Bolsee
svn merge -r 16371:16396 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-04
Daniel Genrich
svn merge -r 16351:16368 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-03
Daniel Genrich
svn merge -r 16334:16347 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-07
Daniel Genrich
Added bullet back to branch, compiling works again
blob
|
commitdiff
|
raw
|
diff to current
2008-05-07
Daniel Genrich
Resolved other bad files in branch, had to kick old...
blob
|
commitdiff
|
raw
2008-05-07
Daniel Genrich
svn merge -r 13452:14721 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-13
Jean-Luc Peurière
resolved conflict state with HEAD r14096
blob
|
commitdiff
|
raw
|
diff to current
2008-02-04
Hamed Zaghaghi
merging game_engine branch changes into trunk, 2d-filte...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-29
Daniel Genrich
Initial commit of cloth modifier from branch rev 13453
blob
|
commitdiff
|
raw
|
diff to current
2008-01-29
Daniel Genrich
svn merge -r 13415:13452 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-26
Daniel Genrich
svn merge -r 13382:13415 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-24
Daniel Genrich
svn merge -r 13357:13382 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-22
Daniel Genrich
svn merge -r 13323:13357 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Daniel Genrich
svn merge -r 13240:13323 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-15
Daniel Genrich
svn merge -r 13177:13240 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-09
Daniel Genrich
svn merge -r 13148:13177 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-08
Nathan Letwory
* tweak linking priorities - should help for GCC users
blob
|
commitdiff
|
raw
|
diff to current
2008-01-07
Daniel Genrich
svn merge -r 13095:13148 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-02
Daniel Genrich
svn merge -r 12937:13095 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-12-18
Daniel Genrich
svn merge -r 12856:12937 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-12-12
Daniel Genrich
svn merge -r 12716:12856 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-29
Daniel Genrich
svn merge -r 12691:12716 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-27
Daniel Genrich
svn merge -r 12684:12691 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-26
Daniel Genrich
Particle merge: svn merge -r 12653:12664 https://svn...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-26
Brecht Van Lommel
Particles
blob
|
commitdiff
|
raw
|
diff to current
2007-11-24
Daniel Genrich
svn merge -r 12653:12664 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-22
Daniel Genrich
svn merge -r 12607:12653 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-16
Daniel Genrich
svn merge -r 12496:12607 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Martin Poirier
Filling in branch from trunk
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Daniel Genrich
updating bullet
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Daniel Genrich
svn merge -r 12478:12495 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-04
Daniel Genrich
svn merge -r 12419:12478 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-28
Daniel Genrich
svn merge -r 12391:12419 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-25
Daniel Genrich
svn merge -r 12382:12391 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-24
Daniel Genrich
svn merge -r 12347:12382 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-22
Daniel Genrich
svn merge -r 12294:12347 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Daniel Genrich
svn merge -r 12208:12294 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-04
Daniel Genrich
Merge ... trunk: svn merge -r 12182:12207 https://svn...
blob
|
commitdiff
|
raw
|
diff to current
2007-10-01
Daniel Genrich
Merge ... trunk: svn merge -r 12151:12179 https://svn...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-26
Daniel Genrich
Merge ... blender svn -> svn merge -r 12064:12150 https...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-17
Daniel Genrich
Marge with trunk: svn merge -r 12050:12057 https:/...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-16
Daniel Genrich
Initial checkin of cloth files + changes
blob
|
commitdiff
|
raw
|
diff to current
2007-07-16
Jiri Hnidek
updated scons build system, neccesary after erwin's...
blob
|
commitdiff
|
raw
|
diff to current
2007-01-28
Ed Halley
Removed -mpowerpc -mtune=G4 from several SCons files...
blob
|
commitdiff
|
raw
|
diff to current
2006-11-30
Nathan Letwory
* add btHeightfieldTerrainShape.cpp
blob
|
commitdiff
|
raw
|
diff to current
2006-11-21
Nathan Letwory
* tweak priority of bullet libs for blenderplayer
blob
|
commitdiff
|
raw
|
diff to current
2006-11-21
Nathan Letwory
* small priority fix. Hopefully helps on more platforms
blob
|
commitdiff
|
raw
|
diff to current
2006-11-21
Nathan Letwory
==SCons==
blob
|
commitdiff
|
raw
|
diff to current
projects / blender.git / history