DarkRadiant: master 5134c2e6

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 12.03.2022 07:35 master 0b472003
Changeset Merge commit 'e61117c057dfe65e3abd4d07f1018781b2c0079e' from orbweaver/master

# Conflicts:
# libs/render.h
# libs/render/MeshVertex.h
# libs/render/RenderableGeometry.h
# libs/render/WindingRenderer.h
# radiantcore/brush/RenderableBrushVertices.cpp
# radiantcore/model/import/FbxModelLoader.cpp
# radiantcore/patch/PatchRenderables.h
# radiantcore/selection/manipulators/Renderables.h
# test/ModelExport.cpp
# test/Models.cpp
mod - install/gl/cubemap_fp.glsl Diff File
mod - libs/math/Matrix3.h Diff File
mod - libs/render.h Diff File
mod - libs/render/MeshVertex.h Diff File
mod - libs/render/RenderableBoundingBoxes.h Diff File
mod - libs/render/RenderableBox.h Diff File
mod - libs/render/RenderableGeometry.h Diff File
mod - libs/render/RenderablePivot.h Diff File
mod - libs/render/RenderableVertexArray.h Diff File
mod - libs/render/Vertex3f.h Diff File
mod - libs/render/VertexCb.h Diff File
mod - libs/render/VertexNCb.h Diff File
mod - libs/selection/BestPoint.h Diff File
mod - plugins/script/interfaces/MathInterface.cpp Diff File
mod - radiant/xyview/tools/MeasurementTool.cpp Diff File
mod - radiant/xyview/tools/MeasurementTool.h Diff File
mod - radiantcore/brush/RenderableBrushVertices.cpp Diff File
mod - radiantcore/entity/RenderableArrow.cpp Diff File
mod - radiantcore/entity/curve/CurveCatmullRom.cpp Diff File
mod - radiantcore/entity/curve/CurveNURBS.cpp Diff File
mod - radiantcore/entity/curve/RenderableCurve.h Diff File
mod - radiantcore/entity/curve/RenderableCurveVertices.h Diff File
mod - radiantcore/entity/doom3group/RenderableVertex.h Diff File
mod - radiantcore/entity/light/Renderables.cpp Diff File
mod - radiantcore/entity/speaker/SpeakerRenderables.cpp Diff File
mod - radiantcore/entity/target/RenderableTargetLines.h Diff File
mod - radiantcore/map/RenderablePointFile.h Diff File
mod - radiantcore/model/export/AseExporter.cpp Diff File
mod - radiantcore/model/export/ModelExporter.cpp Diff File
mod - radiantcore/model/import/AseModel.h Diff File
mod - radiantcore/model/import/FbxModelLoader.cpp Diff File
mod - radiantcore/model/md5/MD5Surface.cpp Diff File
mod - radiantcore/model/md5/RenderableMD5Skeleton.h Diff File
mod - radiantcore/model/picomodel/PicoModelLoader.cpp Diff File
mod - radiantcore/particles/RenderableParticleStage.cpp Diff File
mod - radiantcore/patch/PatchRenderables.cpp Diff File
mod - radiantcore/patch/PatchRenderables.h Diff File
mod - radiantcore/rendersystem/backend/GLProgramFactory.cpp Diff File
mod - radiantcore/rendersystem/backend/GLProgramFactory.h Diff File
mod - radiantcore/rendersystem/backend/WindingRenderer.h Diff File
mod - radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.h Diff File
mod - radiantcore/rendersystem/backend/glprogram/GLSLCubeMapProgram.h Diff File
mod - radiantcore/selection/manipulators/Renderables.h Diff File
mod - radiantcore/selection/manipulators/RotateManipulator.h Diff File
mod - test/ModelExport.cpp Diff File
mod - test/Models.cpp Diff File
mod - test/math/Matrix3.cpp Diff File