]> git.lizzy.rs Git - irrlicht.git/commit
Merging r6145 through r6171 from trunk to ogl-es branch
authorcutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475>
Sat, 19 Dec 2020 15:03:11 +0000 (15:03 +0000)
committercutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475>
Sat, 19 Dec 2020 15:03:11 +0000 (15:03 +0000)
commitfa0b1cb5092bb1c2109ff870587a32b771179705
tree5f5f85e537b2d5d92ff2a2b2e621549a2cc9c062
parent01920bf808be378363ebcdc81e78b251d9189f60
Merging r6145 through r6171 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475
117 files changed:
changes.txt
examples/Demo/CMainMenu.cpp
include/IDynamicMeshBuffer.h
include/IGUIButton.h
include/IGUIEnvironment.h
include/IGUIStaticText.h
include/IImage.h
source/Irrlicht/CBurningShader_Raster_Reference.cpp
source/Irrlicht/CDepthBuffer.cpp
source/Irrlicht/CDepthBuffer.h
source/Irrlicht/CGUIButton.cpp
source/Irrlicht/CGUIButton.h
source/Irrlicht/CGUIContextMenu.cpp
source/Irrlicht/CGUIEnvironment.cpp
source/Irrlicht/CGUIEnvironment.h
source/Irrlicht/CGUIFont.cpp
source/Irrlicht/CGUIStaticText.cpp
source/Irrlicht/CGUIStaticText.h
source/Irrlicht/CGUITreeView.cpp
source/Irrlicht/CIrrDeviceOSX.h
source/Irrlicht/CNullDriver.cpp
source/Irrlicht/CNullDriver.h
source/Irrlicht/CSoftwareDriver2.cpp
source/Irrlicht/CSoftwareDriver2.h
source/Irrlicht/CSoftwareTexture2.cpp
source/Irrlicht/CSoftwareTexture2.h
source/Irrlicht/CTRGouraud2.cpp
source/Irrlicht/CTRGouraudAlpha2.cpp
source/Irrlicht/CTRGouraudAlphaNoZ2.cpp
source/Irrlicht/CTRGouraudNoZ2.cpp
source/Irrlicht/CTRNormalMap.cpp
source/Irrlicht/CTRStencilShadow.cpp
source/Irrlicht/CTRTextureBlend.cpp
source/Irrlicht/CTRTextureDetailMap2.cpp
source/Irrlicht/CTRTextureGouraud2.cpp
source/Irrlicht/CTRTextureGouraudAdd2.cpp
source/Irrlicht/CTRTextureGouraudAddNoZ2.cpp
source/Irrlicht/CTRTextureGouraudAlpha.cpp
source/Irrlicht/CTRTextureGouraudAlphaNoZ.cpp
source/Irrlicht/CTRTextureGouraudNoZ2.cpp
source/Irrlicht/CTRTextureGouraudVertexAlpha2.cpp
source/Irrlicht/CTRTextureLightMap2_Add.cpp
source/Irrlicht/CTRTextureLightMap2_M1.cpp
source/Irrlicht/CTRTextureLightMap2_M2.cpp
source/Irrlicht/CTRTextureLightMap2_M4.cpp
source/Irrlicht/CTRTextureLightMapGouraud2_M4.cpp
source/Irrlicht/CTRTextureWire2.cpp
source/Irrlicht/CTR_transparent_reflection_2_layer.cpp
source/Irrlicht/IBurningShader.cpp
source/Irrlicht/IBurningShader.h
source/Irrlicht/IDepthBuffer.h
source/Irrlicht/S4DVertex.h
source/Irrlicht/SoftwareDriver2_compile_config.h
source/Irrlicht/SoftwareDriver2_helper.h
source/Irrlicht/burning_shader_compile_fragment_start.h
source/Irrlicht/burning_shader_compile_triangle.h
source/Irrlicht/libpng/ANNOUNCE
source/Irrlicht/libpng/AUTHORS [new file with mode: 0644]
source/Irrlicht/libpng/CHANGES
source/Irrlicht/libpng/CMakeLists.txt
source/Irrlicht/libpng/INSTALL [deleted file]
source/Irrlicht/libpng/LICENSE
source/Irrlicht/libpng/README
source/Irrlicht/libpng/TODO
source/Irrlicht/libpng/TRADEMARK [new file with mode: 0644]
source/Irrlicht/libpng/configure [deleted file]
source/Irrlicht/libpng/example.c
source/Irrlicht/libpng/libpng-config.in [deleted file]
source/Irrlicht/libpng/libpng-manual.txt
source/Irrlicht/libpng/libpng.3
source/Irrlicht/libpng/libpng.pc.in [deleted file]
source/Irrlicht/libpng/libpngpf.3
source/Irrlicht/libpng/png.5
source/Irrlicht/libpng/png.c
source/Irrlicht/libpng/png.h
source/Irrlicht/libpng/pngconf.h
source/Irrlicht/libpng/pngdebug.h
source/Irrlicht/libpng/pngerror.c
source/Irrlicht/libpng/pngget.c
source/Irrlicht/libpng/pnginfo.h
source/Irrlicht/libpng/pnglibconf.h
source/Irrlicht/libpng/pngmem.c
source/Irrlicht/libpng/pngpread.c
source/Irrlicht/libpng/pngpriv.h
source/Irrlicht/libpng/pngread.c
source/Irrlicht/libpng/pngrio.c
source/Irrlicht/libpng/pngrtran.c
source/Irrlicht/libpng/pngrutil.c
source/Irrlicht/libpng/pngset.c
source/Irrlicht/libpng/pngstruct.h
source/Irrlicht/libpng/pngtest.c
source/Irrlicht/libpng/pngtest.png
source/Irrlicht/libpng/pngtrans.c
source/Irrlicht/libpng/pngusr.dfa [new file with mode: 0644]
source/Irrlicht/libpng/pngwio.c
source/Irrlicht/libpng/pngwrite.c
source/Irrlicht/libpng/pngwtran.c
source/Irrlicht/libpng/pngwutil.c
tests/flyCircleAnimator.cpp
tests/media/Burning's Video-2dmatFilter.png
tests/media/Burning's Video-ambient-lighting.png
tests/media/Burning's Video-draw2DImage4cFilter.png
tests/media/Burning's Video-drawPixel.png
tests/media/Burning's Video-multiTexture.png
tests/media/Burning's Video-orthoCam.png
tests/media/Burning's Video-planeMatrix-scaledClip.png
tests/media/Burning's Video-renderMipmap.png
tests/media/Burning's Video-stencilShadow.png
tests/media/Burning's Video-terrainGap.png
tests/media/Burning's Video-terrainSceneNode-1.png
tests/media/Burning's Video-terrainSceneNode-2.png
tests/media/Burning's Video-testGeometryCreator.png
tests/media/Burning's Video-testTerrainMesh.png
tests/media/Burning's Video-textureMatrix2.png
tests/media/Burning's Video-textureRenderStates.png
tests/media/Burning's Video-writeImageToFile.png
tests/tests-last-passed-at.txt