Commit Graph

11 Commits (master)

Author SHA1 Message Date
cutealien cbe0894397 Merging r6250 through r6254 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:04:38 +02:00
cutealien b42fbc5ab1 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
2020-06-12 14:24:32 +02:00
cutealien a90caf6867 Merging r5918 through r5944 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5945 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:51:25 +01:00
cutealien d3c91b659d Merge revisions r5438:r5439 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5440 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:22:40 +00:00
cutealien d00ade6cbd Merge revisions r5434:r5436 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5437 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:15:26 +00:00
cutealien 5cc50195e7 Merge r4546-4547 from trunk:
Fix syntax problems in Cg renderer base classes, which came from the override changes.
Third round of override macro updates. Should have touched all functions stating virtual for now. This might still have missed some, as sometimes the virtual keyword is missing on derived functions. And some open points are also still under consideration, will be fixed in future.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4636 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:41:53 +00:00
cutealien 6740009946 Merge r4545 from trunk:
Second round of override checks
Exposed some more functions:
getArchiveName returning name (path) of archive
getColor and getColorHSL for color select dialog
get/setDoubleClickTime in device for setting the time offset necessary to have two separate clicks instead of a double-click
Removed deprecated getXJoint and getMS3DJoint functions
NOTE: CAndroidAssetFileArchive::getArchiveName had to be added additionally to this patch.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:37:26 +00:00
cutealien 70169e0cff merge r4543-4544 from trunk:
First round of override updates.
Some fixes:
Added get/setCurrentRenderPass to scene manager (internally renamed, exposed)
Removed destructor from light scene node.
Removed getType calls from archive loaders (one file archives have this)
Removed some internal exposures and virtual attributes for protected classes
Remove white spaces before semicolon


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4634 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:57:38 +00:00
hybrid 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
hybrid de2e004b83 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: svn://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 d07fc00916 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-23 20:13:43 +00:00