1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-25 21:38:59 +02:00
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
..
2020-05-17 11:21:49 +03:00
2021-02-15 15:03:32 +03:00
2017-08-09 12:18:49 +03:00
2020-10-04 02:20:18 -07:00
2020-10-04 02:20:18 -07:00
2022-05-14 13:23:09 +03:00
2022-09-11 11:31:26 +03:00
2020-10-04 02:20:18 -07:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:26 +03:00
2020-10-04 02:20:18 -07:00
2022-09-11 11:31:27 +03:00
2019-01-19 13:52:02 +03:00
2021-07-26 21:02:50 +03:00
2022-09-11 11:31:26 +03:00
2020-10-04 02:20:18 -07:00
2018-07-26 12:14:29 +02:00
2016-01-31 18:01:58 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2021-02-16 13:32:18 +03:00