projects
/
blender-staging.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
removing files that should not be in blender2.5, added (by mistake?) r19226
[blender-staging.git]
/
intern
/
elbeem
/
SConscript
2009-06-22
Campbell Barton
removing files that should not be in blender2.5, added...
blob
|
commitdiff
|
raw
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-01-26
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
2008-12-23
Nathan Letwory
2.5 / SCons
blob
|
commitdiff
|
raw
2008-11-14
Martin Poirier
Merging trunk 17342:17457
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
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-11-11
Campbell Barton
Adjusted scons files so disabling quicktime, python...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-29
Martin Poirier
merge trunk 17122:17213
blob
|
commitdiff
|
raw
|
diff to current
2008-10-28
Martin Poirier
merge 17122:17206
blob
|
commitdiff
|
raw
|
diff to current
2008-10-22
Nathan Letwory
* Minor cleanup of SCons files
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-22
Daniel Genrich
Removing control define
blob
|
commitdiff
|
raw
|
diff to current
2008-09-21
Daniel Genrich
Merging fluidcontrol to trunk from rev16649 fluidcontro...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-21
Daniel Genrich
svn merge -r 16593:16648 https://svn.blender.org/svnroo...
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-10
Daniel Genrich
svn merge -r 16369:16454 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Daniel Genrich
svn merge -r 16320:16369 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Daniel Genrich
svn merge -r 16222:16320 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-22
Daniel Genrich
svn merge -r 16060:16222 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-12
Daniel Genrich
svn merge -r 15973:16060 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-05
Daniel Genrich
svn merge -r 15800:15973 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-27
Daniel Genrich
svn merge -r 15649:15800 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-20
Daniel Genrich
svn merge -r 15529:15649 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-11
Daniel Genrich
svn merge -r 15409:15529 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-04
Daniel Genrich
Initial GUI implementation, yet not functional
blob
|
commitdiff
|
raw
|
diff to current
2008-07-02
Daniel Genrich
svn merge -r 14676:15409 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-04
Daniel Genrich
svn merge -r 14649:14676 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-30
Daniel Genrich
svn merge -r 14561:14627 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-27
Daniel Genrich
svn merge -r 14505:14561 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-21
Daniel Genrich
svn merge -r 14236:14505 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-08
Nils Thuerey
This version now includes the fluid control sources...
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-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
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
Add WITH_BF_OPENMP for openmp usage, untested on msvc
blob
|
commitdiff
|
raw
|
diff to current
2007-09-17
Daniel Genrich
disable parallel for users
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
2006-02-27
Nils Thuerey
- typo in SConscript
blob
|
commitdiff
|
raw
|
diff to current
2006-02-27
Nils Thuerey
Sorry for the big commit, but I've been fixing many...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Nathan Letwory
==SCons==
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Nathan Letwory
==SCons==
blob
|
commitdiff
|
raw
|
diff to current
2006-02-04
Nathan Letwory
==SCons==
blob
|
commitdiff
|
raw
|
diff to current
2006-02-04
Nathan Letwory
== SCons ==
blob
|
commitdiff
|
raw
|
diff to current
2006-01-28
Chris Want
The code from the orange branch has now been copied...
blob
|
commitdiff
|
raw
|
diff to current
2006-01-28
Chris Want
Final merge of HEAD (bf-blender) into the orange branch.
blob
|
commitdiff
|
raw
|
diff to current
2006-01-26
no-author
This commit was manufactured by cvs2svn to create branc...
blob
|
commitdiff
|
raw
|
diff to current
2006-01-10
Ton Roosendaal
Tuesday merger of bf-blender into orange branch.
blob
|
commitdiff
|
raw
|
diff to current
2006-01-04
Ton Roosendaal
Wednesday sync orange with bf-blender
blob
|
commitdiff
|
raw
|
diff to current
2006-01-03
Ton Roosendaal
Orange; merger with bf-blender.
blob
|
commitdiff
|
raw
|
diff to current
2006-01-01
Ton Roosendaal
Orange <-> bf-blender conflict, with 2.40 saved files...
blob
|
commitdiff
|
raw
|
diff to current
2005-12-19
Ton Roosendaal
Orange: monday merger with bf-blender (loadsa bugfixes).
blob
|
commitdiff
|
raw
|
diff to current
2005-12-17
Ton Roosendaal
Saturday merger of bf-blender in orange branch.
blob
|
commitdiff
|
raw
|
diff to current
2005-12-14
Ton Roosendaal
Another merger of Orange branch with bf-blender, it...
blob
|
commitdiff
|
raw
|
diff to current
2005-12-14
Ton Roosendaal
Wednesday merger of Orange branch and bf-blender
blob
|
commitdiff
|
raw
|
diff to current
2005-12-13
Ton Roosendaal
Tuesday merger of Orange branch with bf-blender
blob
|
commitdiff
|
raw
|
diff to current
2005-12-11
Ton Roosendaal
Sunday merger of orange branch with bf-blender
blob
|
commitdiff
|
raw
|
diff to current
2005-12-06
Ton Roosendaal
Orange: tuesday sync with bf-blender
blob
|
commitdiff
|
raw
|
diff to current
2005-12-04
Ton Roosendaal
Sunday sync of Orange with bf-blender
blob
|
commitdiff
|
raw
|
diff to current
2005-12-02
Ton Roosendaal
Friday merge of bf-blender into orange branch.
blob
|
commitdiff
|
raw
|
diff to current
2005-12-01
Nils Thuerey
- last bugfix caused problems when using the makefile...
blob
|
commitdiff
|
raw
|
diff to current
2005-12-01
Nils Thuerey
- this should fix bug #3468 (scons problem with fluidsi...
blob
|
commitdiff
|
raw
|
diff to current
2005-10-25
Nils Thuerey
Only restructured code:
blob
|
commitdiff
|
raw
|
diff to current
next