1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
vcmi/scripting/lua/api
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
..
battle fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
events fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
netpacks fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Artifact.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Artifact.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
BattleCb.cpp Merge remote-tracking branch 'origin/develop' into terrain-rewrite 2022-09-27 07:50:17 +02:00
BattleCb.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
BonusSystem.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
BonusSystem.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Creature.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Creature.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Faction.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Faction.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
GameCb.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
GameCb.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
HeroClass.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
HeroClass.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
HeroInstance.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
HeroInstance.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
HeroType.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
HeroType.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
ObjectInstance.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
ObjectInstance.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Player.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Player.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Registry.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Registry.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
ServerCb.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
ServerCb.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Services.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Services.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Skill.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Skill.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Spell.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
Spell.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
StackInstance.cpp fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00
StackInstance.h fix building vcmiLua for iOS 2022-09-24 15:55:24 +03:00