nordsoft 89d0de53da Merge remote-tracking branch 'upstream/develop' into features/cpp-map-editor ... # Conflicts: # .github/workflows/github.yml # launcher/modManager/cmodlist.cpp # lib/CModHandler.cpp # lib/CModHandler.h		2022-09-22 17:09:47 +04:00
..
CMapGenerator.cpp	Rotation rebase2 (#912)	2022-09-18 17:39:10 +03:00
CMapGenerator.h	Editor prerequisites [part 2] (#889)	2022-09-17 14:04:01 +03:00
CMapGenOptions.cpp	Editor prerequisites [part 2] (#889)	2022-09-17 14:04:01 +03:00
CMapGenOptions.h	Editor prerequisites [part 2] (#889)	2022-09-17 14:04:01 +03:00
ConnectionsPlacer.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
ConnectionsPlacer.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
CRmgTemplate.cpp	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
CRmgTemplate.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
CRmgTemplateStorage.cpp	Revert "Load template name from user settings"	2022-09-19 02:46:01 +04:00
CRmgTemplateStorage.h	Revert "Load template name from user settings"	2022-09-19 02:46:01 +04:00
CZonePlacer.cpp	Rotation rebase2 (#912)	2022-09-18 17:39:10 +03:00
CZonePlacer.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
float3.h	Fixed lots of warnings.	2020-10-04 02:20:18 -07:00
Functions.cpp	Rotation rebase2 (#912)	2022-09-18 17:39:10 +03:00
Functions.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
ObjectManager.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
ObjectManager.h	Rotation rebase2 (#912)	2022-09-18 17:39:10 +03:00
ObstaclePlacer.cpp	Apply suggestions from code review	2022-09-19 01:18:17 +04:00
ObstaclePlacer.h	Rebase on develop	2022-09-17 17:43:59 +04:00
RiverPlacer.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
RiverPlacer.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
RmgArea.cpp	Fix problems with water zone (#784)	2022-09-11 11:31:27 +03:00
RmgArea.h	Editor prerequisites [part 2] (#889)	2022-09-17 14:04:01 +03:00
RmgMap.cpp	Rotation rebase2 (#912)	2022-09-18 17:39:10 +03:00
RmgMap.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
RmgObject.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
RmgObject.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
RmgPath.cpp	Fix problems with water zone (#784)	2022-09-11 11:31:27 +03:00
RmgPath.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
RoadPlacer.cpp	Mine roads (#808)	2022-09-11 11:31:27 +03:00
RoadPlacer.h	Mine roads (#808)	2022-09-11 11:31:27 +03:00
RockPlacer.cpp	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
RockPlacer.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
TerrainPainter.cpp	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
TerrainPainter.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
TileInfo.cpp	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
TileInfo.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
TownPlacer.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
TownPlacer.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
TreasurePlacer.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
TreasurePlacer.h	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
WaterAdopter.cpp	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
WaterAdopter.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
WaterProxy.cpp	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
WaterProxy.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
WaterRoutes.cpp	Fix problems with water zone (#784)	2022-09-11 11:31:27 +03:00
WaterRoutes.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00
Zone.cpp	Rotation rebase2 (#912)	2022-09-18 17:39:10 +03:00
Zone.h	Random map generator refactoring (#762)	2022-09-11 11:31:27 +03:00