DarkRadiant: master b5071354

Diff Back to Repository
Author Committer Branch Timestamp Parent
orbweaver orbweaver master 10.08.2021 18:24 master d97be6e0
Changeset Merge remote-tracking branch 'greebo/master'
mod - .github/workflows/build.yml Diff File
mod - CMakeLists.txt Diff File
mod - LICENSE Diff File
mod - PKGBUILD Diff File
mod - README.md Diff File
mod - include/iclipboard.h Diff File
add - include/icomparablenode.h Diff File
mod - include/ieclass.h Diff File
mod - include/iglrender.h Diff File
mod - include/imap.h Diff File
add - include/imapmerge.h Diff File
mod - include/imodule.h Diff File
mod - include/inamespace.h Diff File
mod - include/inode.h Diff File
mod - include/irenderable.h Diff File
mod - include/iselection.h Diff File
rm - include/iuimanager.h Diff
add - include/iuserinterface.h Diff File
add - include/iversioncontrol.h Diff File
mod - include/version.h Diff File
add - install/bitmaps/incoming_commits.png Diff File
add - install/bitmaps/merge_arrow.png Diff File
add - install/bitmaps/merge_fork.png Diff File
add - install/bitmaps/merge_selection_mode.png Diff File
add - install/bitmaps/outgoing_commits.png Diff File
add - install/bitmaps/three_way_merge.png Diff File
add - install/bitmaps/two_way_merge.png Diff File
mod - install/games/darkmod.game Diff File
mod - install/games/doom3-demo.game Diff File
mod - install/games/doom3.game Diff File
mod - install/games/prey.game Diff File
mod - install/games/quake3.game Diff File
mod - install/games/quake4.game Diff File
mod - install/games/xreal.game Diff File
mod - install/menu.xml Diff File
mod - install/scripts/commands/shift_textures_randomly.py Diff File
mod - install/scripts/commands/shift_textures_upwards_randomly.py Diff File
mod - install/scripts/test.py Diff File
mod - install/ui/filterdialog.fbp Diff File
mod - install/ui/filterdialog.xrc Diff File
mod - install/ui/filtereditor.fbp Diff File
mod - install/ui/filtereditor.xrc Diff File
add - install/ui/mergecontroldialog.fbp Diff File
add - install/ui/mergecontroldialog.xrc Diff File
mod - install/ui/modelselector.fbp Diff File
mod - install/ui/modelselector.xrc Diff File
add - install/ui/vcscommitdialog.fbp Diff File
add - install/ui/vcscommitdialog.xrc Diff File
add - install/ui/vcsstatusbar.fbp Diff File
add - install/ui/vcsstatusbar.xrc Diff File
mod - install/user.xml Diff File
mod - libs/RGBAImage.h Diff File
mod - libs/ThreadedDefLoader.h Diff File
mod - libs/UndoFileChangeTracker.h Diff File
add - libs/VcsMapResourceStream.h Diff File
add - libs/VersionControlLib.h Diff File
mod - libs/debugging/ScenegraphUtils.h Diff File
mod - libs/gamelib.h Diff File
mod - libs/math/CMakeLists.txt Diff File
add - libs/math/Hash.h Diff File
add - libs/math/SHA256.cpp Diff File
add - libs/math/SHA256.h Diff File
mod - libs/render/CamRenderer.h Diff File
mod - libs/render/RenderableCollectionWalker.h Diff File
mod - libs/render/VertexHashing.h Diff File
mod - libs/scene/CMakeLists.txt Diff File
mod - libs/scene/Node.cpp Diff File
mod - libs/scene/Node.h Diff File
add - libs/scene/merge/ComparisonResult.h Diff File
add - libs/scene/merge/GraphComparer.cpp Diff File
add - libs/scene/merge/GraphComparer.h Diff File
add - libs/scene/merge/LayerMerger.h Diff File
add - libs/scene/merge/LayerMergerBase.h Diff File
add - libs/scene/merge/MergeAction.h Diff File
add - libs/scene/merge/MergeActionNode.cpp Diff File
add - libs/scene/merge/MergeActionNode.h Diff File
add - libs/scene/merge/MergeLib.h Diff File
add - libs/scene/merge/MergeOperation.cpp Diff File
add - libs/scene/merge/MergeOperation.h Diff File
add - libs/scene/merge/MergeOperationBase.cpp Diff File
add - libs/scene/merge/MergeOperationBase.h Diff File
add - libs/scene/merge/NodeUtils.h Diff File
add - libs/scene/merge/SelectionGroupMerger.h Diff File
add - libs/scene/merge/SelectionGroupMergerBase.h Diff File
add - libs/scene/merge/ThreeWayLayerMerger.h Diff File
add - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
add - libs/scene/merge/ThreeWayMergeOperation.h Diff File
add - libs/scene/merge/ThreeWaySelectionGroupMerger.h Diff File
mod - libs/scenelib.h Diff File
add - libs/selection/SelectedPlaneSet.h Diff File
mod - libs/selection/SingleItemSelector.h Diff File
mod - libs/stream/BufferInputStream.h Diff File
mod - libs/stream/ExportStream.h Diff File
add - libs/stream/VcsMapResourceStream.h Diff File
mod - libs/string/convert.h Diff File
mod - libs/string/encoding.h Diff File
mod - libs/wxutil/ConsoleView.cpp Diff File
mod - libs/wxutil/EntityClassChooser.cpp Diff File
mod - libs/wxutil/EntityClassChooser.h Diff File
mod - libs/wxutil/PathEntry.cpp Diff File