..
Android
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht.xcodeproj
OSX: disable ARC (although it is not good)
2020-11-26 15:34:52 +01:00
KHR
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
aesGladman
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
bzip2
Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
2011-01-14 15:36:50 +00:00
jpeglib
libjpeg 9d of 12-Jan-2020
2020-04-13 20:39:20 +02:00
libpng
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
lzma
Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
2011-01-14 15:36:50 +00:00
zlib
Merge r4552-4555 from trunk:
2014-01-07 22:48:49 +00:00
BuiltInFont.h
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
C3DSMeshFileLoader.cpp
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
C3DSMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CAnimatedMeshHalfLife.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CAnimatedMeshHalfLife.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CAnimatedMeshMD2.cpp
- Merged rev 5226-5244 from trunk.
2016-01-17 13:08:20 +00:00
CAnimatedMeshMD2.h
- Merged rev 5226-5244 from trunk.
2016-01-17 13:08:20 +00:00
CAnimatedMeshMD3.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CAnimatedMeshMD3.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CAnimatedMeshSceneNode.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
CAnimatedMeshSceneNode.h
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CAttributeImpl.h
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CAttributes.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CAttributes.h
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CB3DMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CB3DMeshFileLoader.h
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CB3DMeshWriter.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
CB3DMeshWriter.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
CBSPMeshFileLoader.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CBSPMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CBillboardSceneNode.cpp
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CBillboardSceneNode.h
Merge revisions r5450:r5453 from trunk to ogl-es
2017-04-24 13:51:58 +00:00
CBlit.h
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-10-01 19:58:50 +02:00
CBoneSceneNode.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CBoneSceneNode.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CBurningShader_Raster_Reference.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CCSMLoader.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CCSMLoader.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CCameraSceneNode.cpp
Merging r5877 through r5891 from trunk to ogl-es branch
2020-03-09 15:46:11 +01:00
CCameraSceneNode.h
Merging r5686 through r5778 from trunk to ogl-es branch.
2019-02-27 20:20:38 +00:00
CColladaFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CColladaFileLoader.h
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CColladaMeshWriter.cpp
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CColladaMeshWriter.h
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CColorConverter.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CColorConverter.h
Merging r5877 through r5891 from trunk to ogl-es branch
2020-03-09 15:46:11 +01:00
CCubeSceneNode.cpp
Merging r5809 through r5810 from trunk to ogl-es branch
2019-05-20 21:08:01 +00:00
CCubeSceneNode.h
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CD3D9Driver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CD3D9Driver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CD3D9HLSLMaterialRenderer.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CD3D9HLSLMaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CD3D9MaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CD3D9NormalMapRenderer.cpp
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
CD3D9NormalMapRenderer.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CD3D9ParallaxMapRenderer.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CD3D9ParallaxMapRenderer.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CD3D9RenderTarget.cpp
Merging r5892 through r5916 from trunk to ogl-es branch
2020-03-09 15:46:26 +01:00
CD3D9RenderTarget.h
Merging r5623 through r5649 from trunk to ogl-es
2018-10-29 21:25:43 +00:00
CD3D9ShaderMaterialRenderer.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CD3D9ShaderMaterialRenderer.h
Merging r5664 through r5672 from trunk to ogl-es:
2019-01-17 22:47:46 +00:00
CD3D9Texture.cpp
Merging r5892 through r5916 from trunk to ogl-es branch
2020-03-09 15:46:26 +01:00
CD3D9Texture.h
Merging r5892 through r5916 from trunk to ogl-es branch
2020-03-09 15:46:26 +01:00
CDMFLoader.cpp
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
CDMFLoader.h
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
CDefaultGUIElementFactory.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CDefaultGUIElementFactory.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CDefaultSceneNodeAnimatorFactory.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CDefaultSceneNodeAnimatorFactory.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CDefaultSceneNodeFactory.cpp
Merge revisions r5434:r5436 from trunk to ogl-es
2017-04-19 17:15:26 +00:00
CDefaultSceneNodeFactory.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CDepthBuffer.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CDepthBuffer.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CDummyTransformationSceneNode.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CDummyTransformationSceneNode.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CEAGLManager.h
Add missing parameters in CEAGLManager::activateContext.
2020-06-14 11:34:02 +02:00
CEAGLManager.mm
Use GLES3 instead GLES2, when available
2020-04-20 21:33:10 +02:00
CEGLManager.cpp
Merging r5780 through r5786 from trunk to ogl-es branch
2019-03-14 23:03:26 +00:00
CEGLManager.h
Fix compiling on Debian 10 and remove GLES1 support on Linux.
2020-03-09 15:46:16 +01:00
CEmptySceneNode.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CEmptySceneNode.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CFPSCounter.cpp
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
CFPSCounter.h
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
CFileList.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CFileList.h
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CFileSystem.cpp
Merging r5686 through r5778 from trunk to ogl-es branch.
2019-02-27 20:20:38 +00:00
CFileSystem.h
Merging r5686 through r5778 from trunk to ogl-es branch.
2019-02-27 20:20:38 +00:00
CGLXManager.cpp
Merging r5780 through r5786 from trunk to ogl-es branch
2019-03-14 23:03:26 +00:00
CGLXManager.h
Merging r5780 through r5786 from trunk to ogl-es branch
2019-03-14 23:03:26 +00:00
CGUIButton.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUIButton.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUICheckBox.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CGUICheckBox.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIColorSelectDialog.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CGUIColorSelectDialog.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIComboBox.cpp
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CGUIComboBox.h
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CGUIContextMenu.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUIContextMenu.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CGUIEditBox.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CGUIEditBox.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CGUIEnvironment.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUIEnvironment.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUIFileOpenDialog.cpp
Merge revisions r5570 through r5596 from trunk to ogl-es
2017-12-31 20:48:18 +00:00
CGUIFileOpenDialog.h
- Merged rev 5212-5219 from trunk.
2015-12-15 21:06:53 +00:00
CGUIFont.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUIFont.h
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
CGUIImage.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CGUIImage.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CGUIImageList.cpp
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
CGUIImageList.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CGUIInOutFader.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CGUIInOutFader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIListBox.cpp
Merging r5652 through r5663 from trunk to ogl-es.
2018-11-25 15:44:47 +00:00
CGUIListBox.h
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CGUIMenu.cpp
Merge revision 4745:4761 from trunk to ogl-es:
2014-05-08 15:16:46 +00:00
CGUIMenu.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIMeshViewer.cpp
Merge revisions r5428:r5432 from trunk to ogl-es.
2017-04-18 12:35:58 +00:00
CGUIMeshViewer.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIMessageBox.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CGUIMessageBox.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIModalScreen.cpp
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
CGUIModalScreen.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUIProfiler.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CGUIProfiler.h
Merge revision 4971:4973 from trunk to ogl-es:
2014-10-15 19:42:11 +00:00
CGUIScrollBar.cpp
Merging r5652 through r5663 from trunk to ogl-es.
2018-11-25 15:44:47 +00:00
CGUIScrollBar.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUISkin.cpp
Merge revision 4745:4761 from trunk to ogl-es:
2014-05-08 15:16:46 +00:00
CGUISkin.h
Merge revision 4745:4761 from trunk to ogl-es:
2014-05-08 15:16:46 +00:00
CGUISpinBox.cpp
Merging r5652 through r5663 from trunk to ogl-es.
2018-11-25 15:44:47 +00:00
CGUISpinBox.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGUISpriteBank.cpp
Merge revision 4745:4761 from trunk to ogl-es:
2014-05-08 15:16:46 +00:00
CGUISpriteBank.h
Merge revision 4745:4761 from trunk to ogl-es:
2014-05-08 15:16:46 +00:00
CGUIStaticText.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUIStaticText.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUITabControl.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CGUITabControl.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CGUITable.cpp
Merging r5652 through r5663 from trunk to ogl-es.
2018-11-25 15:44:47 +00:00
CGUITable.h
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CGUIToolBar.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CGUIToolBar.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CGUITreeView.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CGUITreeView.h
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CGUIWindow.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CGUIWindow.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CGeometryCreator.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CGeometryCreator.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CImage.cpp
Merging r6120 through r6121 from trunk to ogl-es branch
2020-06-15 12:01:12 +02:00
CImage.h
Merge revisions r5570 through r5596 from trunk to ogl-es
2017-12-31 20:48:18 +00:00
CImageLoaderBMP.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CImageLoaderBMP.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderDDS.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CImageLoaderDDS.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderJPG.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CImageLoaderJPG.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderPCX.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CImageLoaderPCX.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderPNG.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CImageLoaderPNG.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderPPM.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CImageLoaderPPM.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderPSD.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CImageLoaderPSD.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderPVR.cpp
- Merged rev 5258-5275 from trunk.
2016-03-17 22:17:43 +00:00
CImageLoaderPVR.h
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CImageLoaderRGB.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
CImageLoaderRGB.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderTGA.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CImageLoaderTGA.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageLoaderWAL.cpp
Merge revisions r5428:r5432 from trunk to ogl-es.
2017-04-18 12:35:58 +00:00
CImageLoaderWAL.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterBMP.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CImageWriterBMP.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterJPG.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CImageWriterJPG.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterPCX.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CImageWriterPCX.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterPNG.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CImageWriterPNG.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterPPM.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CImageWriterPPM.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterPSD.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CImageWriterPSD.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CImageWriterTGA.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
CImageWriterTGA.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CIrrDeviceConsole.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CIrrDeviceConsole.h
Merging r5946 through r5966 from trunk to ogl-es branch
2020-03-09 15:53:23 +01:00
CIrrDeviceFB.cpp
Fix compile error.
2018-01-09 20:59:20 +00:00
CIrrDeviceFB.h
Merging r5946 through r5966 from trunk to ogl-es branch
2020-03-09 15:53:23 +01:00
CIrrDeviceLinux.cpp
Merging r6173 through r6176 from trunk to ogl-es branch
2020-12-28 18:09:45 +01:00
CIrrDeviceLinux.h
Merging r5946 through r5966 from trunk to ogl-es branch
2020-03-09 15:53:23 +01:00
CIrrDeviceOSX.h
OSX: add missing _IRR_OVERRIDE_
2020-11-26 15:34:19 +01:00
CIrrDeviceOSX.mm
OSX: allow to use OpenGL ES
2020-11-26 15:34:09 +01:00
CIrrDeviceSDL.cpp
Merging r5892 through r5916 from trunk to ogl-es branch
2020-03-09 15:46:26 +01:00
CIrrDeviceSDL.h
Merging r5946 through r5966 from trunk to ogl-es branch
2020-03-09 15:53:23 +01:00
CIrrDeviceStub.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CIrrDeviceStub.h
- Fixed compilation issues on iOS.
2015-12-13 19:13:45 +00:00
CIrrDeviceWin32.cpp
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-10-01 19:58:50 +02:00
CIrrDeviceWin32.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
CIrrDeviceiOS.h
iOS: patches
2019-08-15 16:29:49 +02:00
CIrrDeviceiOS.mm
iOS: add scaling support
2020-04-19 17:12:39 +02:00
CIrrMeshFileLoader.cpp
Merging r5679 through r5685 from trunk to ogl-es branch
2019-01-17 23:15:56 +00:00
CIrrMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CIrrMeshWriter.cpp
Merge revision 4795:4798 from trunk to ogl-es:
2014-05-08 17:06:45 +00:00
CIrrMeshWriter.h
Merging r5686 through r5778 from trunk to ogl-es branch.
2019-02-27 20:20:38 +00:00
CLMTSMeshFileLoader.cpp
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
CLMTSMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CLWOMeshFileLoader.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CLWOMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CLightSceneNode.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CLightSceneNode.h
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CLimitReadFile.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CLimitReadFile.h
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CLogger.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CLogger.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CMD2MeshFileLoader.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CMD2MeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CMD3MeshFileLoader.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CMD3MeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CMS3DMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CMS3DMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CMY3DHelper.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CMY3DMeshFileLoader.cpp
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
CMY3DMeshFileLoader.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
CMemoryFile.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CMemoryFile.h
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CMeshCache.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CMeshCache.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CMeshManipulator.cpp
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CMeshManipulator.h
- Merged rev 5202 from trunk.
2015-12-05 17:34:57 +00:00
CMeshSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CMeshSceneNode.h
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CMeshTextureLoader.cpp
Remove some logging message which I had only enabled to hunt a bug.
2014-03-03 19:50:27 +00:00
CMeshTextureLoader.h
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
CMetaTriangleSelector.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CMetaTriangleSelector.h
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CMountPointReader.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CMountPointReader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CNPKReader.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CNPKReader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CNSOGLManager.h
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-21 11:51:54 +02:00
CNSOGLManager.mm
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-21 11:51:54 +02:00
CNullDriver.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CNullDriver.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
COBJMeshFileLoader.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
COBJMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
COBJMeshWriter.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
COBJMeshWriter.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
COCTLoader.cpp
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
COCTLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
COGLES2Common.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COGLES2Driver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COGLES2Driver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COGLES2ExtensionHandler.cpp
Merging r5678 from trunk to ogl-es branch
2019-01-17 23:11:18 +00:00
COGLES2ExtensionHandler.h
Unify GLES extension handling.
2017-08-18 13:28:20 +00:00
COGLES2FixedPipelineRenderer.cpp
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COGLES2FixedPipelineRenderer.h
Add support for SMaterial::EmissiveColor to fixed pipeline simulation with es2 shaders.
2014-09-26 00:36:19 +00:00
COGLES2MaterialRenderer.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COGLES2MaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COGLES2NormalMapRenderer.cpp
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COGLES2NormalMapRenderer.h
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COGLES2ParallaxMapRenderer.cpp
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COGLES2ParallaxMapRenderer.h
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COGLES2Renderer2D.cpp
Split ogles2 shader for 2D rendering into a texture and non-texture variant.
2017-04-21 12:11:19 +00:00
COGLES2Renderer2D.h
Split ogles2 shader for 2D rendering into a texture and non-texture variant.
2017-04-21 12:11:19 +00:00
COGLESCommon.h
Make it possible again to enable ES1 on Linux.
2020-12-28 18:09:20 +01:00
COGLESCoreExtensionHandler.h
Separate es2 and WebGL extension handlers. Should allow to get RTT's with depht buffers > 16bit to work.
2017-10-27 16:48:00 +00:00
COGLESDriver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COGLESDriver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COGLESExtensionHandler.cpp
Merging r5678 from trunk to ogl-es branch
2019-01-17 23:11:18 +00:00
COGLESExtensionHandler.h
Unify GLES extension handling.
2017-08-18 13:28:20 +00:00
COGLESMaterialRenderer.h
- Fixed compilation issues on Android.
2015-12-06 19:56:33 +00:00
COSOperator.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
COSOperator.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
COctreeSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COctreeSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COctreeTriangleSelector.cpp
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
COctreeTriangleSelector.h
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
COgreMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COgreMeshFileLoader.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
COpenGLCacheHandler.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
COpenGLCacheHandler.h
- Merged rev 5247 from trunk.
2016-01-17 13:38:01 +00:00
COpenGLCommon.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COpenGLCoreCacheHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COpenGLCoreFeature.h
Merging r5678 from trunk to ogl-es branch
2019-01-17 23:11:18 +00:00
COpenGLCoreRenderTarget.h
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COpenGLCoreTexture.h
Fix problem with glGenerateMipMap in GLES2
2020-06-12 15:42:43 +02:00
COpenGLDriver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COpenGLDriver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COpenGLExtensionHandler.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COpenGLExtensionHandler.h
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-10-01 19:58:50 +02:00
COpenGLMaterialRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
COpenGLNormalMapRenderer.cpp
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COpenGLNormalMapRenderer.h
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COpenGLParallaxMapRenderer.cpp
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COpenGLParallaxMapRenderer.h
- Merged revision 5195-5197 from trunk.
2015-11-28 23:18:00 +00:00
COpenGLSLMaterialRenderer.cpp
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-21 11:51:54 +02:00
COpenGLSLMaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-12 15:42:43 +02:00
COpenGLShaderMaterialRenderer.cpp
Merging r5664 through r5672 from trunk to ogl-es:
2019-01-17 22:47:46 +00:00
COpenGLShaderMaterialRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CPLYMeshFileLoader.cpp
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-10-01 19:58:50 +02:00
CPLYMeshFileLoader.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CPLYMeshWriter.cpp
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CPLYMeshWriter.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CPakReader.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CPakReader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CParticleAnimatedMeshSceneNodeEmitter.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CParticleAnimatedMeshSceneNodeEmitter.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CParticleAttractionAffector.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleAttractionAffector.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleBoxEmitter.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleBoxEmitter.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleCylinderEmitter.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleCylinderEmitter.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleFadeOutAffector.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleFadeOutAffector.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleGravityAffector.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleGravityAffector.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleMeshEmitter.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleMeshEmitter.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticlePointEmitter.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticlePointEmitter.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleRingEmitter.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleRingEmitter.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleRotationAffector.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleRotationAffector.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleScaleAffector.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleScaleAffector.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleSphereEmitter.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleSphereEmitter.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleSystemSceneNode.cpp
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CParticleSystemSceneNode.h
Merge revisions r5554 through r5566 from trunk to ogl-es
2017-11-06 14:27:34 +00:00
CProfiler.cpp
Merge revision 4795:4798 from trunk to ogl-es:
2014-05-08 17:06:45 +00:00
CProfiler.h
Merge revision 4795:4798 from trunk to ogl-es:
2014-05-08 17:06:45 +00:00
CQ3LevelMesh.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CQ3LevelMesh.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CQuake3ShaderSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CQuake3ShaderSceneNode.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CReadFile.cpp
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CReadFile.h
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CSMFMeshFileLoader.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSMFMeshFileLoader.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSTLMeshFileLoader.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CSTLMeshFileLoader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CSTLMeshWriter.cpp
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CSTLMeshWriter.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CSceneCollisionManager.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CSceneCollisionManager.h
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CSceneLoaderIrr.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CSceneLoaderIrr.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CSceneManager.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
CSceneManager.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
CSceneNodeAnimatorCameraFPS.cpp
Fix compiler error caused by merge.
2020-11-07 19:38:11 +01:00
CSceneNodeAnimatorCameraFPS.h
Merging r6140 through r6144 from trunk to ogl-es branch.
2020-11-04 01:07:18 +01:00
CSceneNodeAnimatorCameraMaya.cpp
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
CSceneNodeAnimatorCameraMaya.h
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
CSceneNodeAnimatorCollisionResponse.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CSceneNodeAnimatorCollisionResponse.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CSceneNodeAnimatorDelete.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorDelete.h
Merge r4546-4547 from trunk:
2014-01-07 22:41:53 +00:00
CSceneNodeAnimatorFlyCircle.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorFlyCircle.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorFlyStraight.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorFlyStraight.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorFollowSpline.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorFollowSpline.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorRotation.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorRotation.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorTexture.cpp
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CSceneNodeAnimatorTexture.h
Merge revision 4761:4771 from trunk to ogl-es:
2014-05-08 15:23:50 +00:00
CShadowVolumeSceneNode.cpp
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CShadowVolumeSceneNode.h
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CSkinnedMesh.cpp
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
CSkinnedMesh.h
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
CSkyBoxSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CSkyBoxSceneNode.h
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CSkyDomeSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CSkyDomeSceneNode.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CSoftware2MaterialRenderer.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
CSoftwareDriver.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CSoftwareDriver.h
Merging r5946 through r5966 from trunk to ogl-es branch
2020-03-09 15:53:23 +01:00
CSoftwareDriver2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CSoftwareDriver2.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CSoftwareTexture.cpp
Merging r5892 through r5916 from trunk to ogl-es branch
2020-03-09 15:46:26 +01:00
CSoftwareTexture.h
Merging r5652 through r5663 from trunk to ogl-es.
2018-11-25 15:44:47 +00:00
CSoftwareTexture2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CSoftwareTexture2.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CSphereSceneNode.cpp
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CSphereSceneNode.h
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CTRFlat.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRFlatWire.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRGouraud.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRGouraud2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRGouraudAlpha2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRGouraudAlphaNoZ2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRGouraudNoZ2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRGouraudWire.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRNormalMap.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRStencilShadow.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureBlend.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureDetailMap2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureFlat.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRTextureFlatWire.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRTextureGouraud.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CTRTextureGouraud.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CTRTextureGouraud2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudAdd.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRTextureGouraudAdd2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudAddNoZ2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudAlpha.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudAlphaNoZ.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudNoZ.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRTextureGouraudNoZ2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudVertexAlpha2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureGouraudWire.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CTRTextureLightMap2_Add.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureLightMap2_M1.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureLightMap2_M2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureLightMap2_M4.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureLightMapGouraud2_M4.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTRTextureWire2.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTR_transparent_reflection_2_layer.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
CTarReader.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CTarReader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CTerrainSceneNode.cpp
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CTerrainSceneNode.h
Merge revisions r5604 through r5621 from trunk to ogl-es.
2018-06-17 20:01:00 +00:00
CTerrainTriangleSelector.cpp
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CTerrainTriangleSelector.h
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CTextSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CTextSceneNode.h
Merge revisions r5450:r5453 from trunk to ogl-es
2017-04-24 13:51:58 +00:00
CTimer.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CTriangleBBSelector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
CTriangleBBSelector.h
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CTriangleSelector.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
CTriangleSelector.h
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CVideoModeList.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CVideoModeList.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CVolumeLightSceneNode.cpp
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CVolumeLightSceneNode.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CWADReader.cpp
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CWADReader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CWGLManager.cpp
Merging r5918 through r5944 from trunk to ogl-es branch
2020-03-09 15:51:25 +01:00
CWGLManager.h
Merging r5780 through r5786 from trunk to ogl-es branch
2019-03-14 23:03:26 +00:00
CWaterSurfaceSceneNode.cpp
Merging r5788 through r5805 from trunk to ogl-es branch
2019-04-23 20:17:39 +00:00
CWaterSurfaceSceneNode.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CWebGL1Driver.cpp
Merging r5678 from trunk to ogl-es branch
2019-01-17 23:11:18 +00:00
CWebGL1Driver.h
Separate es2 and WebGL extension handlers. Should allow to get RTT's with depht buffers > 16bit to work.
2017-10-27 16:48:00 +00:00
CWebGLExtensionHandler.h
Separate es2 and WebGL extension handlers. Should allow to get RTT's with depht buffers > 16bit to work.
2017-10-27 16:48:00 +00:00
CWriteFile.cpp
Merge revisions r5337:r5415 from trunk to ogl-es.
2017-04-12 15:33:31 +00:00
CWriteFile.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
CXMLReader.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CXMLReader.h
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CXMLReaderImpl.h
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
CXMLWriter.cpp
Merging r5686 through r5778 from trunk to ogl-es branch.
2019-02-27 20:20:38 +00:00
CXMLWriter.h
Merging r5686 through r5778 from trunk to ogl-es branch.
2019-02-27 20:20:38 +00:00
CXMeshFileLoader.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
CXMeshFileLoader.h
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
CZBuffer.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
CZBuffer.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
CZipReader.cpp
Merge revisions r5450:r5453 from trunk to ogl-es
2017-04-24 13:51:58 +00:00
CZipReader.h
Merge r4545 from trunk:
2014-01-07 22:37:26 +00:00
EProfileIDs.h
Add profiling info for the es2 driver.
2014-10-15 22:50:34 +00:00
IAttribute.h
Merge revisions r5570 through r5596 from trunk to ogl-es
2017-12-31 20:48:18 +00:00
IBurningShader.cpp
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
IBurningShader.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
IDepthBuffer.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
IImagePresenter.h
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
ISceneNodeAnimatorFinishing.h
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
ITriangleRenderer.h
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
IZBuffer.h
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
Irrlicht-gcc.cbp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht.cpp
Merging r5678 from trunk to ogl-es branch
2019-01-17 23:11:18 +00:00
Irrlicht.dev
Merge revision 4668-4710 from branch to ogl-es:
2014-03-03 18:30:39 +00:00
Irrlicht.rc
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
2013-04-17 17:45:53 +00:00
Irrlicht.ruleset
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
Irrlicht10.0.sln
Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
2011-01-14 15:36:50 +00:00
Irrlicht10.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht10.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht11.0.sln
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
Irrlicht11.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht11.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht12.0.sln
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
Irrlicht12.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht12.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht14.0.sln
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
Irrlicht14.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht14.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht15.0.sln
Merge revisions r5570 through r5596 from trunk to ogl-es
2017-12-31 20:48:18 +00:00
Irrlicht15.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Irrlicht15.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
Makefile
Merging r6173 through r6176 from trunk to ogl-es branch
2020-12-28 18:09:45 +01:00
Octree.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
S2DVertex.h
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
S4DVertex.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
SB3DStructs.h
Merge revision 4977:5180 from trunk to ogl-es.
2015-11-12 22:32:01 +00:00
SConstruct
Merge revision 4795:4798 from trunk to ogl-es:
2014-05-08 17:06:45 +00:00
SoftwareDriver2_compile_config.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
SoftwareDriver2_helper.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
builtInFont.bmp
fixed a bug I caused in CGUIMenu and CGUIContextMenu. added some more window symbols to the built-in font and the skin.
2007-07-08 12:19:39 +00:00
burning_shader_color.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
burning_shader_color_fraq.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
burning_shader_compile_fragment_default.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-14 11:34:02 +02:00
burning_shader_compile_fragment_end.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
burning_shader_compile_fragment_start.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
burning_shader_compile_start.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
burning_shader_compile_triangle.h
Merging r6145 through r6171 from trunk to ogl-es branch
2020-12-20 22:40:36 +01:00
burning_shader_compile_verify.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-14 11:25:29 +02:00
dmfsupport.h
Fix last merge (revisions 5316:5335 from trunk to ogl-es).
2017-03-13 14:54:20 +00:00
gles-ext.h
Update ext headers for es1 and es2 with newest versions from khronos.
2017-08-17 20:44:56 +00:00
gles2-ext.h
Update ext headers for es1 and es2 with newest versions from khronos.
2017-08-17 20:44:56 +00:00
gles3-ext.h
Update ogl-es extension headers to latest versions.
2012-10-18 11:45:34 +00:00
glext.h
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
glxext.h
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00
irrMathFastCompat.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-06-12 14:24:32 +02:00
irrXML.cpp
Merging r5843 through r5862 from trunk to ogl-es branch
2020-03-09 15:45:59 +01:00
leakHunter.cpp
Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
2013-03-28 17:04:07 +00:00
os.cpp
Removing our newline when logging on emscripten as emscripten_log seems to add it's own newline.
2017-07-29 12:35:22 +00:00
os.h
- Merged rev 5226-5244 from trunk.
2016-01-17 13:08:20 +00:00
resource.h
Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
2011-01-14 15:36:50 +00:00
source.txt
Make use of core::IdentityMatrix. Removed some redundant or unused code. Some minor reorganizations.
2007-12-02 23:57:20 +00:00
utf8.cpp
Merge revision 4922:4923 from trunk to ogl-es:
2014-09-18 22:03:14 +00:00
wglext.h
Merging r5812 through r5842 from trunk to ogl-es branch
2020-03-09 15:45:40 +01:00