DarkRadiant: master 56a6b9f3
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
codereader | codereader | master | 29.10.2021 06:17 | undosystem 444b66e7 |
Changeset | Merge remote-tracking branch 'remotes/orbweaver/master' # Conflicts: # install/menu.xml # radiant/ui/Documentation.cpp # radiant/ui/Documentation.h # radiant/ui/UserInterfaceModule.cpp # radiant/ui/mainframe/FloatingLayout.cpp # radiant/ui/mainframe/FloatingLayout.h # radiantcore/brush/TextureProjection.cpp # radiantcore/map/algorithm/Export.cpp # radiantcore/selection/ManipulationPivot.cpp |
|||
mod - CMakeLists.txt | Diff File | |||
mod - debian/darkradiant.install | Diff File | |||
mod - doc/CMakeLists.txt | Diff File | |||
mod - doc/img/SurfaceInspector.png | Diff File | |||
add - doc/img/preserveAspect.png | Diff File | |||
mod - doc/img/select_mouserotate.png | Diff File | |||
mod - doc/img/select_mousetranslate.png | Diff File | |||
mod - doc/manual.adoc | Diff File | |||
mod - include/irender.h | Diff File | |||
mod - include/irenderview.h | Diff File | |||
mod - install/bitmaps/brush_rotatex.png | Diff File | |||
mod - install/bitmaps/brush_rotatey.png | Diff File | |||
mod - install/bitmaps/brush_rotatez.png | Diff File | |||
mod - install/menu.xml | Diff File | |||
mod - install/ui/gameconnection.fbp | Diff File | |||
mod - install/ui/gameconnection.xrc | Diff File | |||
mod - libs/RGBAImage.h | Diff File | |||
mod - libs/Transformable.h | Diff File | |||
mod - libs/math/AABB.cpp | Diff File | |||
mod - libs/math/AABB.h | Diff File | |||
mod - libs/math/Matrix4.h | Diff File | |||
mod - libs/math/Plane3.cpp | Diff File | |||
mod - libs/math/Vector3.h | Diff File | |||
mod - libs/math/Vector4.h | Diff File | |||
mod - libs/pivot.h | Diff File | |||
mod - libs/render/View.h | Diff File | |||
mod - libs/selection/Pivot2World.h | Diff File | |||
mod - libs/texturelib.h | Diff File | |||
mod - plugins/script/interfaces/MathInterface.cpp | Diff File | |||
mod - radiant/CMakeLists.txt | Diff File | |||
mod - radiant/ui/Documentation.cpp | Diff File | |||
mod - radiant/ui/Documentation.h | Diff File | |||
mod - radiant/ui/UserInterfaceModule.cpp | Diff File | |||
rm - radiant/ui/mainframe/FloatingLayout.cpp | Diff | |||
rm - radiant/ui/mainframe/FloatingLayout.h | Diff | |||
mod - radiant/ui/mainframe/MainFrameLayoutManager.cpp | Diff File | |||
mod - radiantcore/brush/TextureProjection.cpp | Diff File | |||
mod - radiantcore/entity/light/Light.cpp | Diff File | |||
mod - radiantcore/entity/light/LightNode.h | 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/patch/PatchNode.cpp | Diff File | |||
mod - radiantcore/selection/ManipulationPivot.cpp | Diff File | |||
mod - radiantcore/selection/ManipulationPivot.h | 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 - radiantcore/shaders/ShaderExpression.h | Diff File | |||
mod - test/HeadlessOpenGLContext.h | Diff File | |||
mod - test/Renderer.cpp | Diff File | |||
mod - test/Selection.cpp | Diff File | |||
mod - test/math/Matrix4.cpp | Diff File | |||
mod - test/math/Vector.cpp | Diff File |