hybrid
|
f484ff5ca7
|
Merged from trunk, revisions 4488-4493. Only indentation changes, and to have the last merge revision in logs
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4494 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2013-04-04 16:44:31 +00:00 |
|
hybrid
|
e52f7c693c
|
Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2013-04-04 16:15:53 +00:00 |
|
hybrid
|
a774707164
|
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2013-03-28 17:04:07 +00:00 |
|
hybrid
|
fe55d5edec
|
Name of ogl-es 1 driver is different...
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3835 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2011-06-09 14:51:16 +00:00 |
|
hybrid
|
0f933c27a9
|
Add checks for OGLES when testing for driver names in test utils
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3833 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2011-06-09 08:48:46 +00:00 |
|
hybrid
|
c7a7055a25
|
Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2011-01-14 15:36:50 +00:00 |
|
hybrid
|
6e7c44fe95
|
Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2010-01-23 20:13:43 +00:00 |
|
hybrid
|
2832a61dd2
|
Merged revisions 2781:2892 from trunk.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2893 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2009-11-20 10:08:00 +00:00 |
|
hybrid
|
0aa5845e59
|
Merged revisions 2695:2780 from trunk.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2781 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2009-11-02 17:20:21 +00:00 |
|
hybrid
|
9d0cf6c3ba
|
Merged from trunk revisions 2144:2363
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2364 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2009-05-05 00:09:53 +00:00 |
|
hybrid
|
211f574c82
|
Merged from trunk, all revisions from 1977 to 2143.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2144 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2009-01-27 13:23:36 +00:00 |
|
hybrid
|
c5d29d0786
|
Merged all revisions up to 1976 from trunk into ogl-es branch.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
|
2008-12-19 09:56:25 +00:00 |
|