c9cde45d0e
Merging r6256 from trunk to ogl-es branch (fixing OSX again)
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:06:51 +02:00
291fb2ffac
Merging r5788 through r5805 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5806 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-04-23 20:17:39 +00:00
990d475fbb
Merging r5686 through r5778 from trunk to ogl-es branch (part 2)
...
(was in wrong folder in last commit, so only source folder got checked in).
Also adapt ES1 and ES2 driver to remove texture from OGL texture cache
(that was fixed in GL driver in the parts that got merged).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5780 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:30:26 +00:00
88b27cbdeb
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
...
Sorry, accidentally only the android sub-folder got checked-in and the rest was missing.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5366 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-03-13 14:54:20 +00:00
aec5a3afae
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4511 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-17 17:45:53 +00:00
0753afac9d
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 17:04:07 +00:00
e49efc5498
- Updated ogl-es branch to rev4182.
...
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 22:43:38 +00:00
15c3dc795a
Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +00:00
MoNTE48
cutealien
hybrid
nadro