freeminer/irrlicht-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
950 Commits 1 Branch 0 Tags
Commit Graph

21 Commits

Author SHA1 Message Date
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
bb6f7b3cb9 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 17:27:12 +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
f70a39f7f5 Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4487 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-28 14:54:50 +00:00
nadro
dd6f2f46c7 - Added VS2012 projects. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4439 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-16 00:59:25 +00:00
nadro
3d4fb58230 - First version of rewritten OpenGL ES 2.0 driver (IDE projects aren't updated, 2d drawing methods doesn't work, only basic functionality of fixed pipeline materials). This driver will be improved soon. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4435 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-15 00:31:37 +00:00
hybrid
5a8bfaa8d9 Next large merge from trunk, revisions 3729-3830 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-09 07:08:47 +00:00
hybrid
52db69aeed Pass high level shader files to ogl-es drivers. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3804 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-06 15:01:38 +00:00
hybrid
40f2be1ce5 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3727 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-05-18 22:21:50 +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
a8183ff5eb Merged from trunk, revisions 3300-3365. Another large bugfix merge. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-07-18 21:25:27 +00:00
hybrid
28c067bac4 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-06-01 22:52:38 +00:00
hybrid
1584e0d569 Merged revisions 2441:2694 from trunk. This is a huge update which brings the ogl-es branch to the latest 1.6 state. No updates for the ogl-es driver have been incorporated, this branch might not even compile properly right now. I'm just very happy that the merge finally went through... 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2695 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-09-16 12:48:19 +00:00
hybrid
6ff85907c0 Merged revisions 2375:2440 from trunk. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-07-03 09:11:53 +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
hybrid
9847717193 Merged revisions 1726:1852 from trunk for the recent updates. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-27 23:52:13 +00:00
hybrid
b4e8a117c7 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-12 10:11:25 +00:00
hybrid
51e2cb0943 Remove glu from Makefile. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@890 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-02 19:53:13 +00:00
bitplane
30b56d2ec5 Moved everything to /trunk 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-05-20 18:03:49 +00:00