DarkRadiant: master 1af853ab

Author Committer Branch Timestamp Parent
greebo greebo master 27.09.2020 18:21 master dc1df259
Changeset Merge commit '8e0859cd7a428d46719d1af99049c36f13c70d27' from orbweaver's fork.
Lots of conflicts due to the large diff set and the whitespace changes.
mod - configure.ac Diff File
mod - doc/img/DifficultyEditor.png Diff File
mod - doc/img/farClipIn.png Diff File
mod - doc/img/farClipOut.png Diff File
mod - doc/img/lightingMode.png Diff File
mod - doc/img/solidMode16.png Diff File
mod - doc/img/textureMode16.png Diff File
mod - doc/img/wireframeMode16.png Diff File
mod - doc/manual.adoc Diff File
mod - doc/manual.html Diff File
mod - include/ientity.h Diff File
mod - include/iimage.h Diff File
mod - include/imodule.h Diff File
mod - include/irender.h Diff File
mod - include/irenderable.h Diff File
mod - include/ishaders.h Diff File
mod - install/bitmaps/farClipIn.png Diff File
mod - install/bitmaps/farClipOut.png Diff File
mod - install/bitmaps/lightingMode.png Diff File
mod - install/bitmaps/solidMode16.png Diff File
mod - install/bitmaps/textureMode16.png Diff File
add - install/bitmaps/treeView16.png Diff File
mod - install/bitmaps/wireframeMode16.png Diff File
rm - install/gl/Makefile.shaders Diff
rm - install/gl/interaction_fp.arb Diff
rm - install/gl/interaction_fp.cg Diff
rm - install/gl/interaction_vp.arb Diff
rm - install/gl/interaction_vp.cg Diff
rm - install/gl/utils.cg Diff
rm - install/gl/zfill_arbfp1.cg Diff
rm - install/gl/zfill_arbvp1.cg Diff
rm - install/gl/zfill_fp.glp Diff
rm - install/gl/zfill_vp.glp Diff
mod - install/ui/difficultyeditor.fbp Diff File
mod - install/ui/difficultyeditor.xrc Diff File
mod - libs/RGBAImage.h Diff File
mod - libs/module/ApplicationContextBase.cpp Diff File
mod - libs/module/ApplicationContextBase.h Diff File
mod - libs/render/RenderablePivot.h Diff File
mod - libs/render/RenderableSpacePartition.h Diff File
mod - libs/render/SimpleFrontendRenderer.h Diff File
mod - libs/render/VectorLightList.h Diff File
add - libs/wxutil/EntityClassChooser.h Diff File
mod - libs/wxutil/Makefile.am Diff File
mod - plugins/dm.difficulty/DifficultyEditor.cpp Diff File
mod - plugins/dm.difficulty/DifficultyEditor.h Diff File
mod - radiant/Makefile.am Diff File
rm - radiant/camera/CamRenderer.cpp Diff
rm - radiant/camera/CamRenderer.h Diff
mod - radiant/camera/CamWnd.cpp Diff File
mod - radiant/camera/CamWnd.h Diff File
mod - radiant/render/OpenGLModule.cpp Diff File
mod - radiant/render/RenderStatistics.h Diff File
mod - radiant/ui/aas/RenderableAasFile.cpp Diff File
mod - radiant/ui/common/ShaderSelector.cpp Diff File
mod - radiant/ui/einspector/ClassnamePropertyEditor.cpp Diff File
rm - radiant/ui/entitychooser/EntityClassChooser.h Diff
rm - radiant/ui/entitychooser/EntityClassTreePopulator.cpp Diff
rm - radiant/ui/entitychooser/EntityClassTreePopulator.h Diff
mod - radiant/ui/ortho/OrthoContextMenu.cpp Diff File
mod - radiant/xyview/XYRenderer.h Diff File
mod - radiant/xyview/tools/MeasurementTool.cpp Diff File
mod - radiantcore/Radiant.cpp Diff File
mod - radiantcore/brush/Brush.cpp Diff File
mod - radiantcore/brush/BrushClipPlane.h Diff File
mod - radiantcore/brush/BrushNode.cpp Diff File
mod - radiantcore/brush/Face.cpp Diff File
mod - radiantcore/brush/Face.h Diff File
mod - radiantcore/entity/EntityNode.cpp Diff File
mod - radiantcore/entity/VertexInstance.h Diff File
mod - radiantcore/entity/curve/Curve.cpp Diff File
mod - radiantcore/entity/curve/CurveEditInstance.cpp Diff File
mod - radiantcore/entity/generic/GenericEntity.cpp Diff File
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/speaker/SpeakerNode.cpp Diff File
mod - radiantcore/entity/target/RenderableTargetLines.h Diff File
mod - radiantcore/imagefile/BMPLoader.cpp Diff File
rm - radiantcore/imagefile/DDSImage.cpp Diff
rm - radiantcore/imagefile/DDSImage.h Diff
mod - radiantcore/imagefile/JPEGLoader.cpp Diff File
mod - radiantcore/imagefile/PNGLoader.cpp Diff File
mod - radiantcore/imagefile/dds.cpp Diff File
mod - radiantcore/imagefile/ddslib.cpp Diff File
mod - radiantcore/imagefile/ddslib.h Diff File
mod - radiantcore/map/PointFile.cpp Diff File
mod - radiantcore/model/NullModel.cpp Diff File
mod - radiantcore/model/md5/MD5ModelNode.cpp Diff File
mod - radiantcore/model/picomodel/PicoModelNode.cpp Diff File
mod - radiantcore/model/picomodel/PicoModelNode.h Diff File
mod - radiantcore/model/picomodel/RenderablePicoModel.cpp Diff File
mod - radiantcore/model/picomodel/RenderablePicoModel.h Diff File
mod - radiantcore/particles/RenderableParticle.cpp Diff File
mod - radiantcore/patch/Patch.cpp Diff File
mod - radiantcore/patch/PatchNode.cpp Diff File
mod - radiantcore/patch/PatchRenderables.cpp Diff File
mod - radiantcore/rendersystem/OpenGLRenderSystem.cpp Diff File
mod - radiantcore/rendersystem/OpenGLRenderSystem.h Diff File
mod - radiantcore/rendersystem/backend/GLProgramFactory.cpp Diff File
mod - radiantcore/rendersystem/backend/GLProgramFactory.h 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/OpenGLShaderPass.h Diff File
rm - radiantcore/rendersystem/backend/glprogram/ARBBumpProgram.cpp Diff
rm - radiantcore/rendersystem/backend/glprogram/ARBBumpProgram.h Diff
rm - radiantcore/rendersystem/backend/glprogram/ARBDepthFillProgram.cpp Diff
rm - radiantcore/rendersystem/backend/glprogram/ARBDepthFillProgram.h Diff
mod - radiantcore/selection/manipulators/ModelScaleManipulator.cpp Diff File
mod - radiantcore/selection/manipulators/RotateManipulator.cpp Diff File
mod - radiantcore/selection/manipulators/TranslateManipulator.cpp Diff File
mod - radiantcore/shaders/CameraCubeMapDecl.cpp Diff File
mod - radiantcore/shaders/MapExpression.cpp Diff File
mod - radiantcore/shaders/textures/HeightmapCreator.h Diff File
mod - radiantcore/shaders/textures/TextureManipulator.cpp Diff File
mod - tools/msvc/DarkRadiant.vcxproj Diff File
mod - tools/msvc/DarkRadiant.vcxproj.filters Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/dm.difficulty.vcxproj Diff File
mod - tools/msvc/wxutillib.vcxproj Diff File
mod - tools/msvc/wxutillib.vcxproj.filters Diff File