DarkRadiant: renderer3 91cc6314

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo renderer3 19.12.2021 09:24 master 1f38e20c
Changeset Merge branch 'renderer2' into renderer3 to resolve conflicts against latest master

# Conflicts:
# radiantcore/brush/BrushNode.cpp
# radiantcore/entity/doom3group/StaticGeometryNode.cpp
# radiantcore/entity/generic/GenericEntityNode.h
# radiantcore/entity/light/LightNode.cpp
# radiantcore/entity/speaker/SpeakerNode.cpp
# radiantcore/entity/speaker/SpeakerNode.h
# radiantcore/model/StaticModelNode.cpp
# radiantcore/model/md5/MD5ModelNode.cpp
# radiantcore/model/md5/MD5ModelNode.h
# radiantcore/patch/PatchNode.cpp
mod - include/ieclass.h Diff File
add - include/igeometryrenderer.h Diff File
mod - include/imanipulator.h Diff File
mod - include/imousetool.h Diff File
mod - include/iparticles.h Diff File
mod - include/irender.h Diff File
mod - include/irenderable.h Diff File
add - include/iwindingrenderer.h Diff File
mod - include/precompiled_interfaces.h Diff File
mod - include/precompiled_main.h Diff File
add - include/precompiled_render_interfaces.h Diff File
mod - libs/debugging/ScopedDebugTimer.h Diff File
mod - libs/entitylib.h Diff File
mod - libs/pivot.h Diff File
mod - libs/render.h Diff File
mod - libs/render/ArbitraryMeshVertex.h Diff File
mod - libs/render/CamRenderer.h Diff File
add - libs/render/CompactWindingVertexBuffer.h Diff File
mod - libs/render/IndexedVertexBuffer.h Diff File
mod - libs/render/RenderableCollectionWalker.h Diff File
add - libs/render/RenderableCollectorBase.h Diff File
add - libs/render/RenderableGeometry.h Diff File
mod - libs/render/RenderablePivot.h Diff File
mod - libs/render/RenderableSpacePartition.h Diff File
mod - libs/render/SceneRenderWalker.h Diff File
add - libs/render/WindingRenderer.h Diff File
mod - libs/scene/BasicRootNode.h Diff File
mod - libs/scene/Node.cpp Diff File
mod - libs/scene/Node.h Diff File
mod - libs/scene/merge/MergeActionNode.cpp Diff File
mod - libs/scene/merge/MergeActionNode.h Diff File
mod - libs/wxutil/preview/ParticlePreview.cpp Diff File
mod - libs/wxutil/preview/RenderPreview.cpp Diff File
mod - radiant/CMakeLists.txt Diff File
mod - radiant/camera/CamWnd.cpp Diff File
mod - radiant/camera/CamWnd.h Diff File
mod - radiant/ui/aas/RenderableAasFile.cpp Diff File
mod - radiant/ui/aas/RenderableAasFile.h Diff File
rm - radiant/ui/common/RenderableAABB.cpp Diff
rm - radiant/ui/common/RenderableAABB.h Diff
mod - radiant/xyview/GlobalXYWnd.cpp Diff File
mod - radiant/xyview/GlobalXYWnd.h Diff File
mod - radiant/xyview/XYRenderer.h Diff File
mod - radiant/xyview/tools/MeasurementTool.cpp Diff File
mod - radiant/xyview/tools/MeasurementTool.h Diff File
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/brush/Brush.cpp Diff File
mod - radiantcore/brush/Brush.h Diff File
mod - radiantcore/brush/BrushClipPlane.h Diff File
mod - radiantcore/brush/BrushNode.cpp Diff File
mod - radiantcore/brush/BrushNode.h Diff File
mod - radiantcore/brush/Face.cpp Diff File
mod - radiantcore/brush/Face.h Diff File
mod - radiantcore/brush/FaceInstance.cpp Diff File
mod - radiantcore/brush/FaceInstance.h Diff File
add - radiantcore/brush/RenderableWinding.h Diff File
mod - radiantcore/brush/RenderableWireFrame.h Diff File
mod - radiantcore/brush/Winding.cpp Diff File
mod - radiantcore/brush/Winding.h Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File
mod - radiantcore/eclass/EntityClass.h Diff File
mod - radiantcore/entity/ColourKey.h Diff File
mod - radiantcore/entity/EntityModule.cpp Diff File
mod - radiantcore/entity/EntityModule.h Diff File
mod - radiantcore/entity/EntityNode.cpp Diff File
mod - radiantcore/entity/EntityNode.h Diff File
add - radiantcore/entity/RenderableArrow.cpp Diff File
add - radiantcore/entity/RenderableArrow.h Diff File
add - radiantcore/entity/RenderableEntityBox.cpp Diff File
add - radiantcore/entity/RenderableEntityBox.h Diff File
mod - radiantcore/entity/VertexInstance.h Diff File
mod - radiantcore/entity/curve/Curve.cpp Diff File
mod - radiantcore/entity/curve/Curve.h Diff File
mod - radiantcore/entity/curve/CurveCatmullRom.cpp Diff File
mod - radiantcore/entity/curve/CurveCatmullRom.h Diff File
mod - radiantcore/entity/curve/CurveEditInstance.cpp Diff File
mod - radiantcore/entity/curve/CurveEditInstance.h Diff File
mod - radiantcore/entity/curve/CurveNURBS.cpp Diff File
mod - radiantcore/entity/curve/CurveNURBS.h Diff File
mod - radiantcore/entity/curve/RenderableCurve.h Diff File
mod - radiantcore/entity/doom3group/StaticGeometryNode.cpp Diff File
mod - radiantcore/entity/doom3group/StaticGeometryNode.h Diff File
mod - radiantcore/entity/eclassmodel/EclassModelNode.cpp Diff File
mod - radiantcore/entity/eclassmodel/EclassModelNode.h Diff File
mod - radiantcore/entity/generic/GenericEntityNode.cpp Diff File
mod - radiantcore/entity/generic/GenericEntityNode.h Diff File
rm - radiantcore/entity/generic/RenderableArrow.h Diff
mod - radiantcore/entity/light/Light.cpp Diff File
mod - radiantcore/entity/light/Light.h Diff File
mod - radiantcore/entity/light/LightNode.cpp Diff File
mod - radiantcore/entity/light/LightNode.h Diff File
mod - radiantcore/entity/light/Renderables.cpp Diff File
mod - radiantcore/entity/light/Renderables.h Diff File
mod - radiantcore/entity/speaker/SpeakerNode.cpp Diff File
mod - radiantcore/entity/speaker/SpeakerNode.h Diff File
mod - radiantcore/entity/speaker/SpeakerRenderables.cpp Diff File
mod - radiantcore/entity/speaker/SpeakerRenderables.h Diff File
mod - radiantcore/entity/target/RenderableTargetLines.h Diff File
mod - radiantcore/entity/target/TargetKeyCollection.cpp Diff File
mod - radiantcore/entity/target/TargetKeyCollection.h Diff File