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

…

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

…

CDefaultSpellMechanics.cpp

Try to fix http://bugs.vcmi.eu/view.php?id=2362

2016-02-02 11:46:33 +03:00

CDefaultSpellMechanics.h

…

CreatureSpellMechanics.cpp

…

CreatureSpellMechanics.h

…

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

…

ISpellMechanics.h

…

Magic.h

…

SpellMechanics.h

Rename radious -> radius

2016-01-31 18:01:58 +03:00

ViewSpellInt.cpp

…

ViewSpellInt.h

…