DarkRadiant: master f0089aa2
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
greebo | greebo | master | 15.08.2022 05:15 | master a90e50d6 |
Changeset | Merge remote-tracking branch 'remotes/orbweaver/master' # Conflicts: # radiantcore/eclass/EClassManager.cpp # radiantcore/particles/ParticlesManager.cpp # radiantcore/rendersystem/OpenGLRenderSystem.cpp # radiantcore/shaders/Doom3ShaderSystem.cpp # radiantcore/skins/Doom3SkinCache.cpp |
|||
mod - CMakeLists.txt | Diff File | |||
mod - debian/changelog | Diff File | |||
mod - doc/manual.adoc | Diff File | |||
mod - include/icommandsystem.h | Diff File | |||
mod - install/menu.xml | Diff File | |||
mod - install/ui/patchcreatedialog.xrc | Diff File | |||
mod - install/ui/patchthickendialog.xrc | Diff File | |||
mod - libs/module/CMakeLists.txt | Diff File | |||
mod - libs/parser/Tokeniser.h | Diff File | |||
mod - libs/selectionlib.h | Diff File | |||
mod - libs/wxutil/CMakeLists.txt | Diff File | |||
mod - plugins/dm.conversation/plugin.cpp | Diff File | |||
mod - plugins/dm.difficulty/plugin.cpp | Diff File | |||
mod - plugins/dm.editing/plugin.cpp | Diff File | |||
mod - plugins/dm.gui/gui/GuiManager.cpp | Diff File | |||
mod - plugins/dm.gui/plugin.cpp | Diff File | |||
mod - plugins/dm.objectives/objectives.cpp | Diff File | |||
mod - plugins/dm.stimresponse/CMakeLists.txt | Diff File | |||
mod - plugins/dm.stimresponse/StimResponseEditor.cpp | Diff File | |||
mod - plugins/dm.stimresponse/StimResponseEditor.h | Diff File | |||
mod - plugins/dm.stimresponse/plugin.cpp | Diff File | |||
mod - plugins/script/CMakeLists.txt | Diff File | |||
mod - plugins/script/ScriptingSystem.cpp | Diff File | |||
mod - plugins/sound/CMakeLists.txt | Diff File | |||
mod - plugins/vcs/CMakeLists.txt | Diff File | |||
mod - plugins/vcs/GitModule.cpp | Diff File | |||
mod - radiant/CMakeLists.txt | Diff File | |||
mod - radiant/camera/CameraWndManager.cpp | Diff File | |||
mod - radiant/clipboard/ClipboardModule.cpp | Diff File | |||
mod - radiant/eventmanager/EventManager.cpp | Diff File | |||
mod - radiant/eventmanager/EventManager.h | Diff File | |||
mod - radiant/map/StartupMapLoader.cpp | Diff File | |||
mod - radiant/settings/LocalisationModule.cpp | Diff File | |||
mod - radiant/ui/UserInterfaceModule.cpp | Diff File | |||
mod - radiant/ui/common/DialogManager.cpp | Diff File | |||
mod - radiant/ui/favourites/FavouritesUserInterfaceModule.cpp | Diff File | |||
mod - radiant/ui/filters/FilterUserInterface.cpp | Diff File | |||
mod - radiant/ui/gl/WxGLWidgetManager.cpp | Diff File | |||
mod - radiant/ui/grid/GridUserInterface.cpp | Diff File | |||
mod - radiant/ui/groupdialog/GroupDialogManager.cpp | Diff File | |||
mod - radiant/ui/mainframe/MainFrame.cpp | Diff File | |||
mod - radiant/ui/mainframe/MainFrameLayoutManager.cpp | Diff File | |||
mod - radiant/ui/materials/editor/MaterialEditorModule.cpp | Diff File | |||
mod - radiant/ui/mediabrowser/MediaBrowser.cpp | Diff File | |||
mod - radiant/ui/menu/MenuManager.cpp | Diff File | |||
mod - radiant/ui/modelselector/ModelSelector.h | Diff File | |||
mod - radiant/ui/ortho/OrthoContextMenu.cpp | Diff File | |||
mod - radiant/ui/statusbar/StatusBarManager.cpp | Diff File | |||
mod - radiant/ui/texturebrowser/TextureBrowserManager.cpp | Diff File | |||
mod - radiant/xyview/GlobalXYWnd.cpp | Diff File | |||
mod - radiant/xyview/tools/BrushCreatorTool.cpp | Diff File | |||
mod - radiantcore/CMakeLists.txt | Diff File | |||
mod - radiantcore/brush/BrushModule.cpp | Diff File | |||
mod - radiantcore/brush/csg/CSG.cpp | Diff File | |||
mod - radiantcore/camera/CameraManager.cpp | Diff File | |||
mod - radiantcore/clipper/Clipper.cpp | Diff File | |||
mod - radiantcore/clipper/Clipper.h | Diff File | |||
mod - radiantcore/commandsystem/Command.h | Diff File | |||
mod - radiantcore/commandsystem/CommandSystem.cpp | Diff File | |||
mod - radiantcore/commandsystem/CommandSystem.h | Diff File | |||
mod - radiantcore/commandsystem/Executable.h | Diff File | |||
mod - radiantcore/commandsystem/Statement.h | Diff File | |||
mod - radiantcore/decl/DeclarationManager.cpp | Diff File | |||
mod - radiantcore/eclass/EClassColourManager.cpp | Diff File | |||
mod - radiantcore/eclass/EClassManager.cpp | Diff File | |||
mod - radiantcore/entity/EntityModule.cpp | Diff File | |||
mod - radiantcore/entity/light/LightNode.h | Diff File | |||
mod - radiantcore/entity/light/Renderables.cpp | Diff File | |||
mod - radiantcore/filetypes/FileTypeRegistry.cpp | Diff File | |||
mod - radiantcore/fonts/FontManager.cpp | Diff File | |||
mod - radiantcore/grid/GridManager.cpp | Diff File | |||
mod - radiantcore/layers/LayerModule.cpp | Diff File | |||
mod - radiantcore/map/EditingStopwatch.cpp | Diff File | |||
mod - radiantcore/map/Map.cpp | Diff File | |||
mod - radiantcore/map/MapResourceManager.cpp | Diff File | |||
mod - radiantcore/map/RegionManager.cpp | Diff File | |||
mod - radiantcore/map/aas/AasFileManager.cpp | Diff File | |||
mod - radiantcore/map/aas/Doom3AasFileLoader.cpp | Diff File | |||
mod - radiantcore/map/autosaver/AutoSaver.cpp | Diff File | |||
mod - radiantcore/map/format/Doom3MapFormat.cpp | Diff File | |||
mod - radiantcore/map/format/Doom3PrefabFormat.cpp | Diff File | |||
mod - radiantcore/map/format/MapFormatManager.cpp | Diff File | |||
mod - radiantcore/map/format/Quake3MapFormat.cpp | Diff File | |||
mod - radiantcore/map/format/Quake4MapFormat.cpp | Diff File | |||
mod - radiantcore/map/format/portable/PortableMapFormat.cpp | Diff File | |||
mod - radiantcore/map/infofile/InfoFileManager.cpp | Diff File | |||
mod - radiantcore/map/mru/MRU.cpp | Diff File | |||
mod - radiantcore/map/namespace/NamespaceFactory.cpp | Diff File | |||
mod - radiantcore/model/ModelCache.cpp | Diff File | |||
mod - radiantcore/model/ModelFormatManager.cpp | Diff File | |||
mod - radiantcore/model/md5/MD5AnimationCache.cpp | Diff File | |||
mod - radiantcore/particles/ParticlesManager.cpp | Diff File | |||
mod - radiantcore/patch/PatchModule.cpp | Diff File | |||
mod - radiantcore/patch/algorithm/General.cpp | Diff File | |||
mod - radiantcore/patch/algorithm/General.h | Diff File | |||
mod - radiantcore/rendersystem/OpenGLModule.cpp | Diff File | |||
mod - radiantcore/rendersystem/OpenGLRenderSystem.cpp | Diff File | |||
mod - radiantcore/rendersystem/RenderSystemFactory.cpp | Diff File | |||
mod - radiantcore/rendersystem/SharedOpenGLContextModule.cpp | Diff File | |||
mod - radiantcore/scenegraph/SceneGraph.cpp | Diff File |