DarkRadiant: master 609ed5c9
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
greebo | greebo | master | 09.03.2019 07:08 | master a0c4e710 |
Changeset | Merge remote-tracking branch 'orbweaver/master' # Conflicts: # radiant/ui/lightinspector/LightInspector.cpp |
|||
add - .gitlab-ci.yml | Diff File | |||
mod - Makefile.am | Diff File | |||
mod - configure.ac | Diff File | |||
mod - debian/changelog | Diff File | |||
mod - debian/control | Diff File | |||
mod - debian/darkradiant.install | Diff File | |||
rm - depcomp | Diff | |||
add - doc/Makefile.am | Diff File | |||
add - doc/img/2DViewMarkedUp.png | Diff File | |||
add - doc/img/6Cone.png | Diff File | |||
add - doc/img/6Prism.png | Diff File | |||
add - doc/img/6Sphere.png | Diff File | |||
add - doc/img/BlackGreenTheme.png | Diff File | |||
add - doc/img/ClipTool3D.png | Diff File | |||
add - doc/img/CreateRoom.png | Diff File | |||
add - doc/img/CreateRoomBrush.png | Diff File | |||
add - doc/img/DarkRadiantDefaultTheme.png | Diff File | |||
add - doc/img/DarkRadiantWorkflow.png | Diff File | |||
add - doc/img/EdgeEditing.png | Diff File | |||
add - doc/img/EntityClassSelector.png | Diff File | |||
add - doc/img/EntityInspector.png | Diff File | |||
add - doc/img/GameSetupDialog.png | Diff File | |||
add - doc/img/Hollow.png | Diff File | |||
add - doc/img/HollowBrush.png | Diff File | |||
add - doc/img/LayersWindow.png | Diff File | |||
add - doc/img/LightInTwoLayers.png | Diff File | |||
add - doc/img/LightInspector.png | Diff File | |||
add - doc/img/LightSelectedAndUnselected.png | Diff File | |||
add - doc/img/MayaEmulationTheme.png | Diff File | |||
add - doc/img/MediaTab.png | Diff File | |||
add - doc/img/ModelSelector.png | Diff File | |||
add - doc/img/PatchBevel.png | Diff File | |||
add - doc/img/PatchCone.png | Diff File | |||
add - doc/img/PatchCylinder.png | Diff File | |||
add - doc/img/PatchEndCap.png | Diff File | |||
add - doc/img/PatchSphere.png | Diff File | |||
add - doc/img/PatchSubdivision.png | Diff File | |||
add - doc/img/PatchVertexEditing.png | Diff File | |||
add - doc/img/Pointfile.png | Diff File | |||
add - doc/img/PrefabChooser.png | Diff File | |||
add - doc/img/Q3RadiantTheme.png | Diff File | |||
add - doc/img/SelectCompleteTall.png | Diff File | |||
add - doc/img/SelectInside.png | Diff File | |||
add - doc/img/SelectTouching.png | Diff File | |||
add - doc/img/SimplePatchesControlPoints.png | Diff File | |||
add - doc/img/StartPlayback.png | Diff File | |||
add - doc/img/StopPlayback.png | Diff File | |||
add - doc/img/SuperMalTheme.png | Diff File | |||
add - doc/img/SurfaceInspector.png | Diff File | |||
add - doc/img/TexturesTab.png | Diff File | |||
add - doc/img/caution.png | Diff File | |||
add - doc/img/dragresize_symm.png | Diff File | |||
add - doc/img/example.png | Diff File | |||
add - doc/img/farClipIn.png | Diff File | |||
add - doc/img/farClipOut.png | Diff File | |||
add - doc/img/home.png | Diff File | |||
add - doc/img/important.png | Diff File | |||
add - doc/img/lightingMode.png | Diff File | |||
add - doc/img/next.png | Diff File | |||
add - doc/img/note.png | Diff File | |||
add - doc/img/prev.png | Diff File | |||
add - doc/img/solidMode16.png | Diff File | |||
add - doc/img/textureMode16.png | Diff File | |||
add - doc/img/tip.png | Diff File | |||
add - doc/img/up.png | Diff File | |||
add - doc/img/view_show_lightradii.png | Diff File | |||
add - doc/img/warning.png | Diff File | |||
add - doc/img/wireframeMode16.png | Diff File | |||
add - doc/imgsrc/2DView.png | Diff File | |||
add - doc/imgsrc/2DViewMarkedUp.svg | Diff File | |||
add - doc/imgsrc/DarkRadiantWorkflow.svg | Diff File | |||
add - doc/manual.adoc | Diff File | |||
add - doc/manual.css | Diff File | |||
add - doc/manual.html | Diff File | |||
mod - include/iarchive.h | Diff File | |||
mod - include/ifilesystem.h | Diff File | |||
mod - include/imodule.h | Diff File | |||
mod - include/iradiant.h | Diff File | |||
mod - install/menu.xml | Diff File | |||
mod - install/ui/lightinspector.fbp | Diff File | |||
mod - install/ui/lightinspector.xrc | Diff File | |||
mod - libs/Makefile.am | Diff File | |||
rm - libs/ddslib/Makefile.am | Diff | |||
rm - libs/picomodel/Makefile.am | Diff | |||
add - man/Makefile | Diff File | |||
mod - man/darkradiant.1 | Diff File | |||
add - man/darkradiant.adoc | Diff File | |||
mod - plugins/Makefile.am | Diff File | |||
rm - plugins/archivezip/Makefile.am | Diff | |||
rm - plugins/archivezip/plugin.cpp | Diff | |||
rm - plugins/commandsystem/Makefile.am | Diff | |||
mod - plugins/dm.gui/XDataLoader.cpp | Diff File | |||
mod - plugins/dm.gui/gui/GuiManager.cpp | Diff File | |||
rm - plugins/eclassmgr/Makefile.am | Diff | |||
rm - plugins/eclassmgr/eclass_doom3.cpp | Diff | |||
rm - plugins/entity/Makefile.am | Diff | |||
rm - plugins/entity/plugin.cpp | Diff | |||
rm - plugins/entity/plugin.h | Diff | |||
rm - plugins/eventmanager/Makefile.am | Diff | |||
rm - plugins/filetypes/Makefile.am | Diff | |||
rm - plugins/filters/Makefile.am | Diff | |||
rm - plugins/filters/filters.cpp | Diff | |||
rm - plugins/fonts/Makefile.am | Diff | |||
rm - plugins/fonts/plugin.cpp | Diff | |||
rm - plugins/image/Makefile.am | Diff | |||
rm - plugins/image/image.cpp | Diff | |||
rm - plugins/mapdoom3/Makefile.am | Diff | |||
rm - plugins/mapdoom3/mapdoom3.cpp | Diff | |||
rm - plugins/md5model/Makefile.am | Diff | |||
rm - plugins/model/plugin.cpp | Diff | |||
rm - plugins/model/plugin.h | Diff | |||
rm - plugins/particles/Makefile.am | Diff | |||
rm - plugins/particles/particles.cpp | Diff | |||
rm - plugins/scenegraph/Makefile.am | Diff | |||
mod - plugins/script/interfaces/FileSystemInterface.cpp | Diff File | |||
rm - plugins/shaders/Doom3ShaderSystem.cpp | Diff | |||
rm - plugins/shaders/Makefile.am | Diff | |||
rm - plugins/shaders/ShaderFileLoader.cpp | Diff | |||
rm - plugins/shaders/ShaderFileLoader.h | Diff | |||
rm - plugins/shaders/plugin.cpp | Diff | |||
rm - plugins/skins/skincache.cpp | Diff | |||
mod - plugins/sound/SoundManager.cpp | Diff File | |||
rm - plugins/uimanager/Makefile.am | Diff | |||
rm - plugins/vfspk3/ArchiveVisitor.h | Diff | |||
rm - plugins/vfspk3/Doom3FileSystem.cpp | Diff | |||
rm - plugins/vfspk3/FileVisitor.h | Diff | |||
rm - plugins/vfspk3/Makefile.am | Diff | |||
rm - plugins/vfspk3/vfspk3.cpp | Diff | |||
rm - plugins/vfspk3/vfspk3.h | Diff | |||
rm - plugins/xmlregistry/Makefile.am | Diff | |||
rm - plugins/xmlregistry/XMLRegistryModule.cpp | Diff | |||
mod - radiant/Makefile.am | Diff File | |||
mod - radiant/RadiantApp.cpp | Diff File | |||
mod - radiant/RadiantModule.cpp | Diff File | |||
mod - radiant/RadiantModule.h | Diff File |