1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-04 00:15:53 +02:00
vcmi/lib/spells
AlexVinS 6e205a58b4 Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
Conflicts:
	lib/VCMI_lib.cbp
	lib/filesystem/CZipLoader.cpp
	lib/filesystem/CZipLoader.h
	lib/mapObjects/CGTownInstance.cpp
2016-02-04 10:27:51 +03:00
..
AdventureSpellMechanics.cpp Dimension Door: fix movement points cost for expert level 2015-12-21 18:46:52 +03:00
AdventureSpellMechanics.h Fix 0001331 2015-04-13 06:12:23 +03:00
BattleSpellMechanics.cpp Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared 2015-12-29 05:43:33 +03:00
BattleSpellMechanics.h "const" tweak 2015-09-29 17:26:51 +03:00
CDefaultSpellMechanics.cpp Try to fix http://bugs.vcmi.eu/view.php?id=2362 2016-02-02 11:46:33 +03:00
CDefaultSpellMechanics.h "const" tweak 2015-09-29 17:26:51 +03:00
CreatureSpellMechanics.cpp "const" tweak 2015-09-29 17:26:51 +03:00
CreatureSpellMechanics.h "const" tweak 2015-09-29 17:26:51 +03:00
CSpellHandler.cpp Save string identifiers for all game objects 2015-12-05 12:36:39 +03:00
CSpellHandler.h Merge branch 'develop' into feature/VCMIMapFormat1 2016-01-01 20:28:52 +03:00
ISpellMechanics.cpp Allow multiple destinations in BattleSpellCastParameters 2015-09-30 00:31:50 +03:00
ISpellMechanics.h Allow multiple destinations in BattleSpellCastParameters 2015-09-30 00:31:50 +03:00
Magic.h Tweak BattleSpellCastParameters 2015-09-29 17:26:41 +03:00
SpellMechanics.h Rename radious -> radius 2016-01-31 18:01:58 +03:00
ViewSpellInt.cpp
ViewSpellInt.h