1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Commit Graph

4594 Commits

Author SHA1 Message Date
josch
a96b5e7905 add support for FreeBSD 2014-11-17 12:25:10 +01:00
josch
c36042f8c7 rename preprocessor variable VCMI_LINUX to VCMI_XDG
- the variable is only used to enable XDG support
 - XDG is not exclusive to linux
2014-11-17 12:19:52 +01:00
josch
2812334de9 add FL_CPP11 preprocessor define independent of which fuzzylite is used 2014-11-17 11:42:30 +01:00
ArseniyShestakov
4dd1ca5e78 Fix bonuses of Rampart's Treasury and Fountain of Fortune
Change IDs of two special buildings in Rampart to make them identical with one in config files / game assets.

Original code was introduced in 0ca9f64 with those two IDs likely was typo. As result Fountain of Fortune +2 luck bonus was given to Treasury and Treasury's weekly bonus didn't worked at all.
2014-11-17 03:26:18 +03:00
KroArtem
e73c60740c corrected text in vcmibuilder, corrected errors and warnings from cppcheck 2014-11-16 20:48:29 +03:00
AlexVinS
885b495cf4 [Creature window] Fix creature art dismount possibility 2014-11-15 21:54:45 +03:00
AlexVinS
c43b218d64 Fix duplicate MR bonus display 2014-11-15 20:39:21 +03:00
AlexVinS
68d1105233 Fix creature window not showing bonus description 2014-11-15 20:22:50 +03:00
AlexVinS
4c5c83aa1f Re add ERM to workspace
* To keep track of successful build
2014-11-14 07:48:56 +03:00
AlexVinS
b7ed11f582 Fix ERM build
(-) there is one regression, but ERM is unused yet
2014-11-14 07:45:44 +03:00
AlexVinS
752965ff69 Merge branch 'develop' into SpellsRefactoring4
Conflicts:
	lib/CSpellHandler.cpp
2014-11-14 05:28:23 +03:00
AlexVinS
81fb2ae584 Fix crash when casting firewall-like spells after creature casting
#1910
2014-11-14 04:12:50 +03:00
AlexVinS
7a429fc38b Revert @24efb9b4 2014-11-14 03:29:11 +03:00
AlexVinS
8979de7960 Fix issue #1843 (teleport case) 2014-11-14 03:07:14 +03:00
AlexVinS
7af4f44237 rewrite CGHeroInstance::canCastThisSpell 2014-11-13 17:57:35 +03:00
AlexVinS
3fcb1254f7 Rewrite CGHeroInstance::getSpellSchoolLevel using SPELL_SCHOOL_CONFIG 2014-11-13 17:24:30 +03:00
AlexVinS
5d1077161c Change spell school serialization 2014-11-13 16:57:49 +03:00
AlexVinS
787c970003 Simplify CGameInfoCallback::estimateSpellDamage 2014-11-13 15:16:27 +03:00
AlexVinS
3da27243c8 Fix SPELL_DAMAGE_REDUCTION calculation. 2014-11-13 15:07:39 +03:00
AlexVinS
9e8b09d747 Use clearAffected flag 2014-11-13 15:00:45 +03:00
AlexVinS
9f983c67c0 Fix uninitialized variables 2014-11-13 14:35:58 +03:00
AlexVinS
00013ed31a Fix spell school immunity evaluation 2014-11-13 14:10:25 +03:00
AlexVinS
ce8fa33efc Introduced new spell configuration options (not used yet) 2014-11-13 13:37:42 +03:00
AlexVinS
c7480e7fe5 Move getAffectedStacks to mechanics classes 2014-11-13 12:33:51 +03:00
AlexVinS
22c251b57d Small fix for rangeInHexes 2014-11-13 08:29:04 +03:00
AlexVinS
bab7198cd7 Use some constants in SRSLPraserHelpers 2014-11-13 08:13:06 +03:00
AlexVinS
4042757f93 Move spell range calculation to Mechanics
* made ISpellMechanics opaque
2014-11-13 07:34:20 +03:00
AlexVinS
b62ee20880 Move TargetInfo initialization to constructor 2014-11-13 06:29:41 +03:00
AlexVinS
0015027ec7 Draft fo CHAIN_LIGHTNING
* fix usage of RECEPTIVE bonus
2014-11-13 05:40:52 +03:00
AlexVinS
a06dae1f96 Move getAffectedCreatures to CSpell. + more drafts 2014-11-13 04:53:25 +03:00
Ivan Savenko
dce9880d16 Minor refactoring of FunctionList using variadic templates.
Please make sure that all supported compilers are OK with this code
2014-11-12 22:46:37 +02:00
Ivan Savenko
a3d4f9d22f Fixed conversion warnings caused by Qt 2014-11-12 22:46:36 +02:00
AlexVinS
5ba53da9bf Extract SpellMechanics to separate file 2014-11-12 11:36:34 +03:00
AlexVinS
22178151aa More general spell school handling 2014-11-12 11:03:55 +03:00
AlexVinS
d7800b834e get rid of CBattleInfoCallback::calculateSpellDmg 2014-11-12 09:52:11 +03:00
AlexVinS
e4b726151d get rid of CBattleInfoCallback::battleStackIsImmune 2014-11-12 09:20:20 +03:00
AlexVinS
ddf98a5920 +SpecialRisingSpellMechanics::isImmuneByStack 2014-11-12 08:34:43 +03:00
AlexVinS
639b915391 Move calculateSpellBonus to CSpell 2014-11-12 08:02:27 +03:00
AlexVinS
059698217c Use CLONE and DISPEL_HELPFUL_SPELLS Mechanics classes in immunity caculation 2014-11-12 07:41:12 +03:00
AlexVinS
61d6bca3ff Extract some spell imuunity mechanics + draft of overall design (UNTESTED) 2014-11-12 07:09:05 +03:00
AlexVinS
a49da360d2 Use ESpellCastProblem inside SpellHandler 2014-11-12 06:17:03 +03:00
AlexVinS
24efb9b413 SpellHandler: add more error checking + cleanup. 2014-11-12 03:48:11 +03:00
AlexVinS
c4fdca45d9 Small cleanup 2014-11-12 03:48:10 +03:00
Ivan Savenko
356b6ab34a A bit delayed, but still - Linux version bump 2014-11-11 22:59:26 +02:00
Alexander Shishkin
0b1ee70e56 Merge pull request #54 from xyzz/fix_cgpregame_runlocked_crash
Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame
2014-11-11 04:07:54 +03:00
Ivan Savenko
2692150efc Merge pull request #52 from josch/launcherNoAutoCheckRepositories
Launcher: do not automatically check remote repositories
2014-11-10 19:51:14 +02:00
Ilya Zhuravlev
b22973e717 Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame. 2014-11-10 20:21:39 +03:00
josch
b962e11bd7 Launcher: add setting allowing not to automatically check remote repositories
- add a button to the launcher which allows manual downloading
 - add a configuration option autoCheckRepositories to launcher settings
 - add ui elements to settings dialog to change autoCheckRepositories
2014-11-10 08:21:47 +01:00
Ivan Savenko
176e029cd1 Merge pull request #53 from xyzz/fix_1907
Fixed "Hex grid" button crash, partially fixes 1907.
2014-11-09 16:00:54 +02:00
AlexVinS
53016300ca Restore files accidentely deleted in 01491f9f1e 2014-11-06 22:23:49 +03:00