DarkRadiant: master babb9670

Author Committer Branch Timestamp Parent
codereader codereader master 11.09.2017 08:40 master e55c6551
Changeset Merge branch 'archive_refactor'

# Conflicts:
# tools/xcode/DarkRadiant.xcodeproj/project.pbxproj
mod - configure.ac Diff File
add - libs/DirectoryArchiveFile.h Diff File
add - libs/DirectoryArchiveTextFile.h Diff File
rm - libs/archivelib.h Diff
rm - libs/bytestreamutils.h Diff
mod - libs/debugging/ScopedDebugTimer.h Diff File
rm - libs/fs_filesystem.h Diff
add - libs/stream/BinaryToTextInputStream.h Diff File
mod - libs/stream/BufferInputStream.h Diff File
add - libs/stream/FileInputStream.h Diff File
mod - libs/stream/PointerInputStream.h Diff File
mod - libs/stream/ScopedArchiveBuffer.h Diff File
rm - libs/stream/filestream.h Diff
add - libs/stream/utils.h Diff File
mod - libs/string/string.h Diff File
mod - plugins/archivezip/DeflatedArchiveFile.h Diff File
mod - plugins/archivezip/DeflatedArchiveTextFile.h Diff File
add - plugins/archivezip/DeflatedInputStream.cpp Diff File
add - plugins/archivezip/DeflatedInputStream.h Diff File
add - plugins/archivezip/GenericFileSystem.h Diff File
mod - plugins/archivezip/Makefile.am Diff File
add - plugins/archivezip/StoredArchiveFile.h Diff File
add - plugins/archivezip/StoredArchiveTextFile.h Diff File
mod - plugins/archivezip/ZipArchive.cpp Diff File
mod - plugins/archivezip/ZipArchive.h Diff File
add - plugins/archivezip/ZipStreamUtils.h Diff File
rm - plugins/archivezip/pkzip.cpp Diff
rm - plugins/archivezip/pkzip.h Diff
mod - plugins/archivezip/plugin.cpp Diff File
rm - plugins/archivezip/plugin.h Diff
rm - plugins/archivezip/zlibstream.cpp Diff
rm - plugins/archivezip/zlibstream.h Diff
mod - plugins/eclassmgr/EClassManager.cpp Diff File
mod - plugins/image/Doom3ImageLoader.cpp Diff File
mod - plugins/image/ImageLoaderWx.cpp Diff File
mod - plugins/image/TGALoader.cpp Diff File
mod - plugins/md5model/MD5AnimationCache.cpp Diff File
mod - plugins/md5model/MD5ModelLoader.cpp Diff File
mod - plugins/model/Lwo2Chunk.cpp Diff File
mod - plugins/model/Lwo2Exporter.cpp Diff File
mod - plugins/sound/OggFileStream.h Diff File
mod - plugins/sound/SoundManager.cpp Diff File
mod - plugins/sound/SoundPlayer.cpp Diff File
mod - plugins/uimanager/colourscheme/ColourSchemeManager.cpp Diff File
mod - plugins/vfspk3/DirectoryArchive.cpp Diff File
mod - plugins/vfspk3/Doom3FileSystem.cpp Diff File
mod - radiant/map/Map.cpp Diff File
mod - radiant/map/MapResource.cpp Diff File
mod - tools/msvc/archivezip.vcxproj Diff File
mod - tools/msvc/archivezip.vcxproj.filters Diff File
mod - tools/msvc/libs.vcxproj Diff File
mod - tools/msvc/libs.vcxproj.filters Diff File
mod - tools/xcode/DarkRadiant.xcodeproj/project.pbxproj Diff File