nordsoft 5ce0f7c4e0 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor ...

# Conflicts:
#	lib/CHeroHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/ObjectTemplate.cpp
#	lib/mapObjects/ObjectTemplate.h
#	lib/mapping/CCampaignHandler.h
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.cpp
#	lib/mapping/CMapEditManager.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ConnectionsPlacer.cpp
#	lib/rmg/ObjectManager.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RiverPlacer.cpp
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/RmgObject.cpp
#	lib/rmg/TownPlacer.cpp
#	lib/rmg/TreasurePlacer.cpp
#	lib/rmg/TreasurePlacer.h
#	lib/rmg/WaterProxy.cpp
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h
#	lib/serializer/CSerializer.h
#	lib/spells/CSpellHandler.cpp

2022-09-11 18:26:11 +04:00

..

AdapterLoaders.cpp

Possibility to load maps from any folder

2022-09-11 00:50:41 +04:00

AdapterLoaders.h

Possibility to load maps from any folder

2022-09-11 00:50:41 +04:00

CArchiveLoader.cpp

Fixed lots of warnings.

2020-10-04 02:20:18 -07:00

CArchiveLoader.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CBinaryReader.cpp

use Conan to make macOS CI builds for both Intel and ARM (#782)

2022-08-30 17:29:00 +03:00

CBinaryReader.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CCompressedStream.cpp

Fixed lots of warnings.

2020-10-04 02:20:18 -07:00

CCompressedStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CFileInputStream.cpp

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CFileInputStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CFilesystemLoader.cpp

Launcher fixes for mod filesystem (#860)

2022-09-10 19:30:41 +03:00

CFilesystemLoader.h

Launcher fixes for mod filesystem (#860)

2022-09-10 19:30:41 +03:00

CInputOutputStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CInputStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CMemoryBuffer.cpp

WiP on zip serialization

2015-12-05 12:06:47 +03:00

CMemoryBuffer.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CMemoryStream.cpp

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CMemoryStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

COutputStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CZipLoader.cpp

Fixed lots of warnings.

2020-10-04 02:20:18 -07:00

CZipLoader.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

CZipSaver.cpp

Warnings fixes (#538)

2019-01-19 13:52:02 +03:00

CZipSaver.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

FileInfo.cpp

Spells configuration version 2 (effect-based)

2018-02-08 11:37:21 +03:00

FileInfo.h

Spells configuration version 2 (effect-based)

2018-02-08 11:37:21 +03:00

FileStream.cpp

Fixed lots of warnings.

2020-10-04 02:20:18 -07:00

FileStream.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

Filesystem.cpp

Possibility to load maps from any folder

2022-09-11 00:50:41 +04:00

Filesystem.h

Possibility to load maps from any folder

2022-09-11 00:50:41 +04:00

ISimpleResourceLoader.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

MinizipExtensions.cpp

Fixed lots of warnings.

2020-10-04 02:20:18 -07:00

MinizipExtensions.h

Code style: move or add licensing information on top of every file

2017-07-14 01:26:03 +03:00

ResourceID.cpp

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00

ResourceID.h

Entities redesign and a few ERM features

2021-02-14 19:05:43 +03:00