DarkRadiant: master e10a6968

Diff Back to Repository
Author Committer Branch Timestamp Parent
greebo greebo master 30.11.2020 03:36 master 505a16d5
Changeset Merge remote-tracking branch 'remotes/origin/openmapsfrompk4'

# Conflicts:
# radiantcore/Makefile.am
# tools/msvc/DarkRadiant.vcxproj.filters
# tools/msvc/DarkRadiantCore.vcxproj
# tools/msvc/DarkRadiantCore.vcxproj.filters
# tools/msvc/Tests/Tests.vcxproj.filters
mod - include/iarchive.h Diff File
mod - include/ifilesystem.h Diff File
mod - include/ifiletypes.h Diff File
mod - include/imapresource.h Diff File
add - install/bitmaps/file.png Diff File
add - install/bitmaps/package.png Diff File
mod - install/menu.xml Diff File
mod - libs/debugging/ScopedDebugTimer.h Diff File
mod - libs/os/file.h Diff File
add - libs/os/filesize.h Diff File
add - libs/stream/MapResourceStream.h Diff File
mod - libs/wxutil/EntityClassChooser.cpp Diff File
mod - libs/wxutil/Makefile.am Diff File
mod - libs/wxutil/TreeView.cpp Diff File
mod - libs/wxutil/TreeView.h Diff File
mod - libs/wxutil/VFSTreePopulator.cpp Diff File
mod - libs/wxutil/VFSTreePopulator.h Diff File
add - libs/wxutil/fsview/FileSystemView.cpp Diff File
add - libs/wxutil/fsview/FileSystemView.h Diff File
add - libs/wxutil/fsview/Populator.cpp Diff File
add - libs/wxutil/fsview/Populator.h Diff File
mod - plugins/sound/SoundManager.cpp Diff File
mod - plugins/sound/SoundPlayer.cpp Diff File
mod - radiant/Makefile.am Diff File
mod - radiant/ui/UserInterfaceModule.cpp Diff File
mod - radiant/ui/einspector/SkinChooser.cpp Diff File
add - radiant/ui/mapselector/MapSelector.cpp Diff File
add - radiant/ui/mapselector/MapSelector.h Diff File
rm - radiant/ui/prefabselector/PrefabPopulator.cpp Diff
rm - radiant/ui/prefabselector/PrefabPopulator.h Diff
mod - radiant/ui/prefabselector/PrefabSelector.cpp Diff File
mod - radiant/ui/prefabselector/PrefabSelector.h Diff File
mod - radiant/uimanager/SoundChooser.cpp Diff File
mod - radiantcore/Makefile.am Diff File
mod - radiantcore/eclass/Doom3EntityClass.cpp Diff File
mod - radiantcore/filetypes/FileTypeRegistry.cpp Diff File
mod - radiantcore/filetypes/FileTypeRegistry.h Diff File
add - radiantcore/map/ArchivedMapResource.cpp Diff File
add - radiantcore/map/ArchivedMapResource.h Diff File
mod - radiantcore/map/Map.cpp Diff File
mod - radiantcore/map/Map.h Diff File
mod - radiantcore/map/MapResource.cpp Diff File
mod - radiantcore/map/MapResource.h Diff File
add - radiantcore/map/MapResourceLoader.cpp Diff File
add - radiantcore/map/MapResourceLoader.h Diff File
mod - radiantcore/map/MapResourceManager.cpp Diff File
mod - radiantcore/map/MapResourceManager.h Diff File
add - radiantcore/map/NodeCounter.h Diff File
mod - radiantcore/map/algorithm/MapImporter.cpp Diff File
mod - radiantcore/map/algorithm/MapImporter.h Diff File
mod - radiantcore/settings/GameManager.cpp Diff File
mod - radiantcore/shaders/ShaderDefinition.h Diff File
mod - radiantcore/shaders/ShaderLibrary.cpp Diff File
rm - radiantcore/vfs/Archive.h Diff
add - radiantcore/vfs/AssetsList.h Diff File
mod - radiantcore/vfs/DirectoryArchive.cpp Diff File
mod - radiantcore/vfs/DirectoryArchive.h Diff File
mod - radiantcore/vfs/Doom3FileSystem.cpp Diff File
mod - radiantcore/vfs/Doom3FileSystem.h Diff File
add - radiantcore/vfs/FileVisitor.h Diff File
mod - radiantcore/vfs/GenericFileSystem.h Diff File
mod - radiantcore/vfs/ZipArchive.cpp Diff File
mod - radiantcore/vfs/ZipArchive.h Diff File
add - test/FileTypes.cpp Diff File
mod - test/Makefile.am Diff File
mod - test/MapExport.cpp Diff File
add - test/MapSavingLoading.cpp Diff File
mod - test/TestContext.h Diff File
mod - test/VFS.cpp Diff File
add - test/algorithm/Primitives.h Diff File
mod - test/algorithm/Scene.h Diff File
add - test/algorithm/XmlUtils.h Diff File
add - test/resources/map_loading_test.pk4 Diff File
add - test/resources/tdm/altar.pk4 Diff File
add - test/resources/tdm/maps/altar.darkradiant Diff File
add - test/resources/tdm/maps/altar.map 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/Tests/Tests.vcxproj Diff File
mod - tools/msvc/Tests/Tests.vcxproj.filters Diff File
mod - tools/msvc/libs.vcxproj Diff File
mod - tools/msvc/libs.vcxproj.filters Diff File
mod - tools/msvc/wxutillib.vcxproj Diff File
mod - tools/msvc/wxutillib.vcxproj.filters Diff File