hybrid
|
0ca3ba3744
|
Merged revisions 3089-3138 from 1.7 branch. Full merge, all changes from 1.7 beta phase up to now are included.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3139 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2010-01-08 11:46:38 +00:00 |
|
hybrid
|
ca8f261819
|
Merged from 1.5 branch to trunk, all changes from 2088 to 2120. Mainly doc updates. Fix for non-skinned animated meshes with different current frames.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2121 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2009-01-22 12:40:06 +00:00 |
|
hybrid
|
386a18b566
|
Merged revisions 1652:1682 from the 1.4 branch: Code layout changes in the examples and SMaterial checks for self-assignment.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1683 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-11-04 14:47:51 +00:00 |
|
hybrid
|
8db1da30c2
|
Merge revisions 1572:1596 from 1.4 branch: Some late bugfixes of the 1.4.2 release. Tutorial generation mechanism.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1598 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-09-29 20:46:43 +00:00 |