hybrid
|
136f9981d5
|
Oops, off by one merge error. Revision 1885 was missing in trunk...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2026 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2009-01-03 23:19:41 +00:00 |
|
hybrid
|
9bc11201d5
|
Merged from 1.5 branch to trunk, all changes from 1933 to 1953. Camera and animation fixes, project file updates, etc.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1954 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-12-15 14:18:11 +00:00 |
|
hybrid
|
ad43762777
|
Merged from 1.5 branch to trunk, all changes from 1913 to 1932. Mostly example and test fixes. Some bug fixes, camera interface changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1933 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-12-08 17:06:34 +00:00 |
|
hybrid
|
ace653f4fc
|
Merged revisions 1885:1912 from 1.5 branch. More unit tests and bug fixes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1913 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-12-03 22:26:53 +00:00 |
|
hybrid
|
0b03402773
|
Merged from 1.5 branch to trunk, all changes from 1821 to 1835. Mostly warning fixes, GL ASM shaders repaired, d3d9 RTTs less memory consuming, skinned mesh bboxes updating.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1837 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-11-26 10:44:30 +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
|
24c7dd09c2
|
Merged revisions 1600:1650 from 1.4 branch. Just renaming of example 17.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1651 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-10-27 16:40:56 +00:00 |