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
..
2021-02-14 19:05:43 +03:00
2022-09-11 11:31:27 +03:00
2022-05-19 15:14:50 +03:00
2022-09-11 18:26:11 +04:00
2020-05-17 11:21:49 +03:00
2022-09-11 18:26:11 +04:00
2022-09-11 18:26:11 +04:00
2019-06-09 17:28:55 +02:00
2022-09-11 11:31:27 +03:00
2022-09-11 18:26:11 +04:00
2022-09-11 18:26:11 +04:00
2022-09-11 16:13:53 +03:00
2021-02-14 19:05:43 +03:00
2017-07-14 01:26:03 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2018-05-26 14:50:49 +03:00
2018-05-26 14:50:49 +03:00
2021-02-15 15:03:32 +03:00
2022-09-11 11:31:26 +03:00
2017-08-11 23:06:27 +03:00
2017-08-09 12:18:49 +03:00
2020-10-04 02:20:18 -07:00
2017-07-14 01:26:03 +03:00
2020-10-04 02:20:18 -07:00
2018-07-16 22:05:42 +02:00
2022-05-14 13:23:09 +03:00
2017-07-18 00:04:00 +03:00
2022-09-11 11:31:28 +03:00
2022-09-11 11:31:27 +03:00
2021-11-28 20:00:43 +02:00
2021-11-28 20:00:43 +02:00
2022-09-11 11:31:26 +03:00
2021-07-26 21:02:50 +03:00
2021-02-14 19:05:43 +03:00
2021-02-14 19:05:43 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:26 +03:00
2022-05-19 15:14:50 +03:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:26 +03:00
2022-09-11 13:42:21 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:26 +03:00
2017-07-14 01:26:03 +03:00
2017-07-14 01:26:03 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:26 +03:00
2021-02-14 19:05:43 +03:00
2022-09-11 11:31:26 +03:00
2020-10-04 02:20:18 -07:00
2018-02-08 11:37:21 +03:00
2021-02-14 19:05:43 +03:00
2021-02-14 19:05:43 +03:00
2021-02-14 19:05:43 +03:00
2022-09-11 11:31:26 +03:00
2018-01-02 09:49:03 +01:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:26 +03:00
2017-07-14 01:26:03 +03:00
2020-10-04 02:20:18 -07:00
2021-02-14 19:05:43 +03:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:26 +03:00
2017-07-14 01:26:03 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:26 +03:00
2019-01-19 13:52:02 +03:00
2022-09-11 11:31:27 +03:00
2021-09-12 14:30:54 +03:00
2022-01-30 12:31:07 +02:00
2016-02-21 21:21:22 +03:00
2021-02-14 19:05:43 +03:00
2021-07-26 21:02:50 +03:00
2017-07-14 01:26:03 +03:00
2022-03-21 09:43:06 +02:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:26 +03:00
2022-08-31 01:24:12 +04:00
2022-08-31 01:24:12 +04:00
2017-07-14 01:26:03 +03:00
2017-07-14 01:26:03 +03:00
2021-11-28 20:00:43 +02:00
2021-02-14 19:05:43 +03:00
2022-09-11 11:31:26 +03:00
2018-04-04 14:24:26 +07: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
2013-04-02 17:06:43 +00:00
2021-10-15 09:51:32 +03:00
2021-02-14 19:05:43 +03:00
2022-08-30 08:30:21 +03:00
2022-09-11 11:31:26 +03:00
2016-01-31 18:01:58 +03:00
2016-08-13 16:57:18 +03:00
2022-09-11 11:31:26 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2017-07-14 01:26:03 +03:00
2017-07-14 01:26:03 +03:00
2021-02-16 13:32:18 +03:00
2022-09-11 11:31:27 +03:00
2022-09-11 11:31:27 +03:00
2019-06-09 17:28:55 +02:00
2018-08-22 17:31:48 +03:00
2021-03-05 21:00:33 +00:00
2017-07-14 01:26:03 +03:00