Merging r6128 through r6139 from trunk to ogl-es branch.
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6122 through r6127 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6128
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6120 through r6121 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6122
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6117 through r6119 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6120
dfc29bdd-3216-0410-991c-
e03cc46cb475
Add missing parameters in CEAGLManager::activateContext.
Thanks to Maksym Hamarnyk for the patch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6118
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6107 through r6116 from trunk to ogl-es branch
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6075 through r6106 from trunk to ogl-es branch.
Burnings renderer changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6073 through r6074 from trunk to ogl-es branch.
The support for UINT shader constants added in this is just returning warnings in GLES drivers as this would need ES 3.0
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6115
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r6039 through r6072 from trunk to ogl-es branch.
Note: Not yet caught up with trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6114
dfc29bdd-3216-0410-991c-
e03cc46cb475
Fix problem with glGenerateMipMap in GLES2
Thanks @wolfgang for report and patch: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=52625
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6112
dfc29bdd-3216-0410-991c-
e03cc46cb475
Merging r5975 through r6036 from trunk to ogl-es branch.
GLES drivers adapted, but only did make compile-tests.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038
dfc29bdd-3216-0410-991c-
e03cc46cb475