luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity
This repository has been archived on 2025-10-04. You can view files and clone it, but cannot push or open issues or pull requests.
Files
01920bf808be378363ebcdc81e78b251d9189f60
irrlicht-archive/source/Irrlicht
History
cutealien 01920bf808 Fix compiler error caused by merge. 
Thanks @ Maksym for report.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6152 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-11-04 23:32:24 +00:00
..
aesGladman
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
Android
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
bzip2
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht.xcodeproj
Remove headers from source-file sections in XCode project file.
2020-11-03 22:00:19 +00:00
jpeglib
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
KHR
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
libpng
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
lzma
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
zlib
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
builtInFont.bmp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
BuiltInFont.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
burning_shader_color_fraq.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
burning_shader_color.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
burning_shader_compile_fragment_default.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
burning_shader_compile_fragment_end.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
burning_shader_compile_fragment_start.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
burning_shader_compile_start.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
burning_shader_compile_triangle.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
burning_shader_compile_verify.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
C3DSMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
C3DSMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshHalfLife.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshHalfLife.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshMD2.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshMD2.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshMD3.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshMD3.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAnimatedMeshSceneNode.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CAnimatedMeshSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAttributeImpl.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAttributes.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CAttributes.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CB3DMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CB3DMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CB3DMeshWriter.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CB3DMeshWriter.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CBillboardSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CBillboardSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CBlit.h
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
CBoneSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CBoneSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CBSPMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CBSPMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CBurningShader_Raster_Reference.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CCameraSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CCameraSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CColladaFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CColladaFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CColladaMeshWriter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CColladaMeshWriter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CColorConverter.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
CColorConverter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CCSMLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CCSMLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CCubeSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CCubeSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9Driver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
CD3D9Driver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
CD3D9HLSLMaterialRenderer.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
CD3D9HLSLMaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
CD3D9MaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
CD3D9NormalMapRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9NormalMapRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9ParallaxMapRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9ParallaxMapRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9RenderTarget.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9RenderTarget.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9ShaderMaterialRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9ShaderMaterialRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9Texture.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CD3D9Texture.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDefaultGUIElementFactory.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDefaultGUIElementFactory.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDefaultSceneNodeAnimatorFactory.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDefaultSceneNodeAnimatorFactory.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDefaultSceneNodeFactory.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDefaultSceneNodeFactory.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDepthBuffer.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CDepthBuffer.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CDMFLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDMFLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDummyTransformationSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CDummyTransformationSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CEAGLManager.h
Add missing parameters in CEAGLManager::activateContext.
2020-06-13 14:49:38 +00:00
CEAGLManager.mm
Add missing parameters in CEAGLManager::activateContext.
2020-06-13 14:49:38 +00:00
CEGLManager.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CEGLManager.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CEmptySceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CEmptySceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CFileList.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CFileList.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CFileSystem.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CFileSystem.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CFPSCounter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CFPSCounter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGeometryCreator.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGeometryCreator.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGLXManager.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGLXManager.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIButton.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIButton.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUICheckBox.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUICheckBox.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIColorSelectDialog.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIColorSelectDialog.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIComboBox.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIComboBox.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIContextMenu.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CGUIContextMenu.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditBox.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditBox.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEnvironment.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEnvironment.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIFileOpenDialog.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIFileOpenDialog.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIFont.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIFont.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIImage.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIImage.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIImageList.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIImageList.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIInOutFader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIInOutFader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIListBox.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIListBox.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIMenu.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIMenu.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIMeshViewer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIMeshViewer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIMessageBox.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIMessageBox.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIModalScreen.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIModalScreen.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIProfiler.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIProfiler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIScrollBar.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIScrollBar.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUISkin.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUISkin.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUISpinBox.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUISpinBox.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUISpriteBank.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUISpriteBank.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIStaticText.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIStaticText.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITabControl.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITabControl.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITable.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITable.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIToolBar.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIToolBar.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITreeView.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITreeView.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIWindow.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIWindow.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImage.cpp
Merging r6120 through r6121 from trunk to ogl-es branch
2020-06-14 20:52:53 +00:00
CImage.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderBMP.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderBMP.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderDDS.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderDDS.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderJPG.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderJPG.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPCX.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPCX.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPNG.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPNG.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPPM.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPPM.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPSD.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPSD.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPVR.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderPVR.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderRGB.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CImageLoaderRGB.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderTGA.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderTGA.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderWAL.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageLoaderWAL.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterBMP.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
CImageWriterBMP.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterJPG.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
CImageWriterJPG.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPCX.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPCX.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPNG.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
CImageWriterPNG.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPPM.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPPM.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPSD.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterPSD.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CImageWriterTGA.cpp
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
CImageWriterTGA.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceConsole.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceConsole.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceFB.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceFB.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceiOS.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceiOS.mm
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceLinux.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceLinux.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceOSX.h
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-20 15:26:29 +00:00
CIrrDeviceOSX.mm
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
CIrrDeviceSDL.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceSDL.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceStub.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceStub.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrDeviceWin32.cpp
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
CIrrDeviceWin32.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CIrrMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrMeshWriter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CIrrMeshWriter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLightSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLightSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLimitReadFile.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLimitReadFile.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLMTSMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLMTSMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLogger.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLogger.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLWOMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CLWOMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMD2MeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMD2MeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMD3MeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMD3MeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMemoryFile.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMemoryFile.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshCache.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshCache.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshManipulator.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshManipulator.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshTextureLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMeshTextureLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMetaTriangleSelector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMetaTriangleSelector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMountPointReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMountPointReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMS3DMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMS3DMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMY3DHelper.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMY3DMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMY3DMeshFileLoader.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CNPKReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CNPKReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CNSOGLManager.h
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-20 15:26:29 +00:00
CNSOGLManager.mm
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-20 15:26:29 +00:00
CNullDriver.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CNullDriver.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COBJMeshFileLoader.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
COBJMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COBJMeshWriter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COBJMeshWriter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COCTLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COCTLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COctreeSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COctreeSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COctreeTriangleSelector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COctreeTriangleSelector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2Common.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2Driver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COGLES2Driver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COGLES2ExtensionHandler.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2ExtensionHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2FixedPipelineRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2FixedPipelineRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2MaterialRenderer.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COGLES2MaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COGLES2NormalMapRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2NormalMapRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2ParallaxMapRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2ParallaxMapRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2Renderer2D.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLES2Renderer2D.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLESCommon.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLESCoreExtensionHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLESDriver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COGLESDriver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COGLESExtensionHandler.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLESExtensionHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COGLESMaterialRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COgreMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COgreMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLCacheHandler.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLCacheHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLCommon.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLCoreCacheHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLCoreFeature.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLCoreRenderTarget.h
Merging r6039 through r6072 from trunk to ogl-es branch.
2020-06-10 22:19:09 +00:00
COpenGLCoreTexture.h
Fix problem with glGenerateMipMap in GLES2
2020-06-10 20:57:08 +00:00
COpenGLDriver.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COpenGLDriver.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COpenGLExtensionHandler.cpp
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COpenGLExtensionHandler.h
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
COpenGLMaterialRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLNormalMapRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLNormalMapRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLParallaxMapRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLParallaxMapRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLShaderMaterialRenderer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLShaderMaterialRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
COpenGLSLMaterialRenderer.cpp
Merging r6122 through r6127 from trunk to ogl-es branch
2020-06-20 15:26:29 +00:00
COpenGLSLMaterialRenderer.h
Merging r6073 through r6074 from trunk to ogl-es branch.
2020-06-11 20:27:29 +00:00
COSOperator.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
COSOperator.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CPakReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CPakReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleAnimatedMeshSceneNodeEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleAnimatedMeshSceneNodeEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleAttractionAffector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleAttractionAffector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleBoxEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleBoxEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleCylinderEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleCylinderEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleFadeOutAffector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleFadeOutAffector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleGravityAffector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleGravityAffector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleMeshEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleMeshEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticlePointEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticlePointEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleRingEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleRingEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleRotationAffector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleRotationAffector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleScaleAffector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleScaleAffector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleSphereEmitter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleSphereEmitter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleSystemSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CParticleSystemSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CPLYMeshFileLoader.cpp
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
CPLYMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CPLYMeshWriter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CPLYMeshWriter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CProfiler.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CProfiler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CQ3LevelMesh.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CQ3LevelMesh.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CQuake3ShaderSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CQuake3ShaderSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CReadFile.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CReadFile.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneCollisionManager.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneCollisionManager.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneLoaderIrr.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneLoaderIrr.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneManager.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CSceneManager.h
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CSceneNodeAnimatorCameraFPS.cpp
Fix compiler error caused by merge.
2020-11-04 23:32:24 +00:00
CSceneNodeAnimatorCameraFPS.h
Merging r6140 through r6144 from trunk to ogl-es branch.
2020-11-02 22:26:23 +00:00
CSceneNodeAnimatorCameraMaya.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorCameraMaya.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorCollisionResponse.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorCollisionResponse.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorDelete.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorDelete.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorFlyCircle.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorFlyCircle.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorFlyStraight.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorFlyStraight.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorFollowSpline.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorFollowSpline.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorRotation.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorRotation.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorTexture.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSceneNodeAnimatorTexture.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CShadowVolumeSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CShadowVolumeSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSkinnedMesh.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSkinnedMesh.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSkyBoxSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSkyBoxSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSkyDomeSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSkyDomeSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSMFMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSMFMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSoftware2MaterialRenderer.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CSoftwareDriver2.cpp
Merging r6140 through r6144 from trunk to ogl-es branch.
2020-11-02 22:26:23 +00:00
CSoftwareDriver2.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CSoftwareDriver.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSoftwareDriver.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSoftwareTexture2.cpp
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
CSoftwareTexture2.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CSoftwareTexture.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSoftwareTexture.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSphereSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSphereSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSTLMeshFileLoader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSTLMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSTLMeshWriter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CSTLMeshWriter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTarReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTarReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTerrainSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTerrainSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTerrainTriangleSelector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTerrainTriangleSelector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTextSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTextSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTimer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTR_transparent_reflection_2_layer.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRFlat.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRFlatWire.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRGouraud2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRGouraud.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRGouraudAlpha2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRGouraudAlphaNoZ2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRGouraudNoZ2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRGouraudWire.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTriangleBBSelector.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTriangleBBSelector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTriangleSelector.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CTriangleSelector.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRNormalMap.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRStencilShadow.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureBlend.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureDetailMap2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureFlat.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureFlatWire.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureGouraud2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraud.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureGouraud.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureGouraudAdd2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraudAdd.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureGouraudAddNoZ2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraudAlpha.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraudAlphaNoZ.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraudNoZ2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraudNoZ.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureGouraudVertexAlpha2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureGouraudWire.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CTRTextureLightMap2_Add.cpp
Merging r6107 through r6116 from trunk to ogl-es branch
2020-06-12 20:47:40 +00:00
CTRTextureLightMap2_M1.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureLightMap2_M2.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureLightMap2_M4.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureLightMapGouraud2_M4.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CTRTextureWire2.cpp
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
CVideoModeList.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CVideoModeList.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CVolumeLightSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CVolumeLightSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWADReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWADReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWaterSurfaceSceneNode.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWaterSurfaceSceneNode.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWebGL1Driver.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWebGL1Driver.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWebGLExtensionHandler.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWGLManager.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWGLManager.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWriteFile.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CWriteFile.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CXMeshFileLoader.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
CXMeshFileLoader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CXMLReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CXMLReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CXMLReaderImpl.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CXMLWriter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CXMLWriter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CZBuffer.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CZBuffer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CZipReader.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CZipReader.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
dmfsupport.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
EProfileIDs.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
gles2-ext.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
gles3-ext.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
gles-ext.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
glext.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
glxext.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
IAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
IBurningShader.cpp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
IBurningShader.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
IDepthBuffer.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
IImagePresenter.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht10.0.sln
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht10.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht10.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht11.0.sln
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht11.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht11.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht12.0.sln
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht12.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht12.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht14.0.sln
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht14.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht14.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht15.0.sln
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht15.0.vcxproj
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht15.0.vcxproj.filters
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht-gcc.cbp
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Irrlicht.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht.dev
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht.rc
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Irrlicht.ruleset
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
irrMathFastCompat.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
irrXML.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
ISceneNodeAnimatorFinishing.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
ITriangleRenderer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
IZBuffer.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
leakHunter.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Makefile
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
Octree.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
os.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
os.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
resource.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
S2DVertex.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
S4DVertex.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
SB3DStructs.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
SConstruct
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
SoftwareDriver2_compile_config.h
Merging r6075 through r6106 from trunk to ogl-es branch.
2020-06-12 20:41:49 +00:00
SoftwareDriver2_helper.h
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
source.txt
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
utf8.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
wglext.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00