1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
vcmi/lib/rmg
Tomasz Zieliński f386f42166 Merge remote-tracking branch 'origin/develop' into terrain-rewrite
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
2022-09-27 07:50:17 +02:00
..
CMapGenerator.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
CMapGenerator.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
CMapGenOptions.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
CMapGenOptions.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
ConnectionsPlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
ConnectionsPlacer.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
CRmgTemplate.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
CRmgTemplate.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
CRmgTemplateStorage.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
CRmgTemplateStorage.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
CZonePlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
CZonePlacer.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
float3.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
Functions.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
Functions.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
ObjectManager.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
ObjectManager.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
ObstaclePlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
ObstaclePlacer.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RiverPlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RiverPlacer.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
RmgArea.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
RmgArea.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
RmgMap.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RmgMap.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RmgObject.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RmgObject.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RmgPath.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
RmgPath.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
RoadPlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RoadPlacer.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
RockPlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
RockPlacer.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
TerrainPainter.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
TerrainPainter.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
TileInfo.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
TileInfo.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
TownPlacer.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
TownPlacer.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
TreasurePlacer.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
TreasurePlacer.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
WaterAdopter.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
WaterAdopter.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
WaterProxy.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
WaterProxy.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
WaterRoutes.cpp wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
WaterRoutes.h wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 2022-09-24 15:55:21 +03:00
Zone.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
Zone.h Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00