games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-11 14:49:23 +02:00
Code Issues Releases Activity
vcmi/scripting
History
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
..
erm
fix building vcmiERM for iOS
2022-09-24 15:55:24 +03:00
lua
Merge remote-tracking branch 'origin/develop' into terrain-rewrite
2022-09-27 07:50:17 +02:00