DarkRadiant: master 30b48a74

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 29.03.2021 04:23 master 899025f4
Changeset Merge remote-tracking branch 'remotes/orbweaver/master'

# Conflicts:
# radiantcore/rendersystem/backend/OpenGLShader.cpp
# radiantcore/rendersystem/backend/OpenGLShader.h
# radiantcore/rendersystem/backend/OpenGLShaderPass.cpp
mod - include/iglprogram.h Diff File
mod - include/ilightnode.h Diff File
mod - include/irender.h Diff File
mod - include/iselectiontest.h Diff File
mod - install/gl/interaction_fp.glsl Diff File
mod - libs/Transformable.h Diff File
mod - libs/debugging/render.h Diff File
mod - libs/math/AABB.cpp Diff File
mod - libs/math/CMakeLists.txt Diff File
mod - libs/math/Matrix4.cpp Diff File
mod - libs/math/Matrix4.h Diff File
mod - libs/math/Plane3.cpp Diff File
rm - libs/math/Quaternion.cpp Diff
mod - libs/math/Quaternion.h Diff File
mod - libs/math/Vector3.h Diff File
mod - libs/math/Vector4.h Diff File
mod - libs/math/pi.h Diff File
mod - libs/pivot.h Diff File
mod - libs/render.h Diff File
mod - libs/render/CameraView.h Diff File
mod - libs/render/Colour4.h Diff File
mod - libs/selection/BestPoint.h Diff File
mod - libs/selection/Pivot2World.h Diff File
mod - libs/selection/SelectionVolume.h Diff File
mod - libs/wxutil/preview/RenderPreview.cpp Diff File
mod - libs/wxutil/preview/RenderPreview.h Diff File
mod - radiant/ui/aas/RenderableAasFile.cpp Diff File
mod - radiant/xyview/XYWnd.cpp Diff File
mod - radiant/xyview/tools/MeasurementTool.cpp Diff File
mod - radiantcore/brush/Brush.cpp Diff File
mod - radiantcore/brush/TextureProjection.cpp Diff File
mod - radiantcore/entity/AngleKey.cpp Diff File
mod - radiantcore/entity/RotationMatrix.cpp Diff File
mod - radiantcore/entity/generic/GenericEntityNode.cpp Diff File
mod - radiantcore/entity/light/Light.cpp Diff File
mod - radiantcore/entity/light/LightNode.h Diff File
mod - radiantcore/entity/speaker/SpeakerRenderables.cpp Diff File
mod - radiantcore/entity/target/TargetLineNode.cpp Diff File
mod - radiantcore/map/algorithm/Export.cpp Diff File
mod - radiantcore/particles/ParticleNode.cpp Diff File
mod - radiantcore/particles/RenderableParticleBunch.cpp Diff File
mod - radiantcore/particles/RenderableParticleStage.cpp Diff File
mod - radiantcore/patch/PatchNode.cpp Diff File
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp Diff File
mod - radiantcore/rendersystem/backend/OpenGLShader.h Diff File
mod - radiantcore/rendersystem/backend/OpenGLShaderPass.cpp Diff File
mod - radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.cpp Diff File
mod - radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.h Diff File
mod - radiantcore/selection/ManipulationPivot.cpp Diff File
mod - radiantcore/selection/algorithm/Transformation.cpp Diff File
mod - radiantcore/selection/manipulators/ManipulatorComponents.cpp Diff File
mod - radiantcore/selection/manipulators/RotateManipulator.cpp Diff File
mod - radiantcore/selection/manipulators/TranslateManipulator.cpp Diff File
mod - test/CMakeLists.txt Diff File
mod - test/Entity.cpp Diff File
rm - test/Face.cpp Diff
add - test/Renderer.cpp Diff File
mod - test/Selection.cpp Diff File
mod - test/math/Matrix4.cpp Diff File
mod - test/math/Plane3.cpp Diff File
mod - test/math/Quaternion.cpp Diff File
mod - test/math/Vector3.cpp Diff File
mod - tools/msvc/Tests/Tests.vcxproj Diff File
mod - tools/msvc/Tests/Tests.vcxproj.filters Diff File
mod - tools/msvc/mathlib.vcxproj Diff File