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@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
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@4636 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4548-4549 from trunk:
Add equals check with tolerance in heigthmap optimizer
Unify texture transformation for tex coord system with mesh loader.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4637 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4552-4555 from trunk:
Merged libpng 1.6.2 from vendor branch. Updated pnglibconf.h to latest predefined config file to catch up with latest setup requirements.
Merged version 9 of libjpeg from vendor branch.
Merge from vendor branch version 1.2.8 of zlib


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4638 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4556-4557 from trunk:
Add a CMatrix4::getRotationDegrees where you can pass the scale vector if you know it (faster and useful otherwise sometimes).
Fix material deserialization. Empty textures were producing a texture named '0' (zero), which lead to annoying warnings all over the place. This empty string is hopefully safe everywhere.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4639 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4558 from trunk:
Optimized OpenGL shaders renderer.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4640 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4559 from trunk:
Improved switch between fixed and programmable pipeline materials.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4641 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4560-4561 from trunk:
- Fixed compilation issues with CG support enabled.
- Moved setBasicRenderStates methods calls in shader based material renderers to the same place as in standard fixed pipeline material renderers (first lines of OnSetMaterial method).
- Fixed bug with texture states in OpenGL.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4642 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4562-4570 from trunk:
Remove wrong _IRR_OVERRIDE_'s which prevented compiling on Linux.
Updated changes text file.
EMT_TRANSPARENT_ALPHA_CHANNEL_REF working again like in older Irrlicht versions (1.4 or so):
It uses again SMaterial::MaterialTypeParam instead of a hardcoded values and makes an exception when MaterialTypeParam is 0 (using it like 0.5 instead) to ensure it works by default. See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940 for new discussion.
_IRR_OVERRIDE_ needed a few more checks on gcc to prevent compile warnings on some systems.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4643 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4571 from trunk:
Update to latest glext headers, add new extension strings, fix one order bug
NOTE: Latest glext headers had already been in this branch, so only other patches applied.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4644 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4572-4578 from trunk:
Add intersect method to create intersect box, provided by hendu
Fix order problem and missing deletes in OpenGL extension strings.
Reverting my changes from r4569 as they also break stuff by now. Will continue the discussion in http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940
Reverted changes related to CallBack->OnSetMaterial call.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4645 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4579 from trunk:
Merged revision 4534-4578 from 1.8 branch:
- Fix crash in SoftwareDriver2 when Material was EMT_DETAIL_MAP but texture[1] was not set (Thanks for fix by chronologicaldot)
- Fix issue in CAnimatedMeshSceneNode::clone which cause crash. (reported and fixed by luthyr)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4646 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4580-4594 from trunk:
Removed unnecessary glFinish call on OSX platform. Thanks devonsoft for report this bug.
Merge near identical code in CTriangleSelector::createFromMesh and CTriangleSelector::updateFromMesh (createFromMesh now using updateFromMesh).
vector2d::equals now has an tolerance parameter for passing the epsilon (like vector3d has already). Note that this changes the default behavior of vector2d::equals as well as functions using it like the operators for ==, !=, <, >, <=, >= when using vector2d with f64 as the tolerance is increased in that case (for f32 and integer values it shouldn't make any difference).
line2d::intersectWith has a new parameter to allow ignoring intersections with coincident lines
Revert VS10 project file to previous version as it got accidentally checked in with static linking enabled (sorry).
Fix more typos in documentation and add a little more docs (thx @Yoran for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4647 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4600 from trunk:
Update to OpenGL 4.4 headers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4648 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4602-4608 from trunk:
Collada loader now instantiates camera nodes which had been ignore so far (thx @NemoStein for the test .dae)
Add render calls to two windows, where possible


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4649 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4616-4617 from trunk:
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4650 dfc29bdd-3216-0410-991c-e03cc46cb475
Merge r4618-4629 from trunk. Branch has now catched up to trunk again :-)
Fix memory access in d3dx mipmap generation. Thanks to hellflip for the hint.
Developer documentation - adding a release checklist.
Improve speed for finalizing skinned meshes (removal of unnecessary frames after loading) (thx @ichtyander for the testmodel)
Down from ~20 seconds to ~0,5 seconds :-)
Minor bugfix for my last check-in. dropBadKeys now finds some more broken frames.
Changing calling convention for static lib release fast CPU to Cdecl because FastCall did not actually compile (conflicts with pnglib). Also the same setting is used when compiling as dll, so I guess this setting was simply not tested. Thanks @AReich for reporting. See thread for more info:  http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49462


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code@4651 dfc29bdd-3216-0410-991c-e03cc46cb475