AlexVinS
d4ae63e7ef
Expert FIRE_SHIELD should not be massive
2015-09-14 12:08:48 +03:00
AlexVinS
0e8598bafe
Merge branch 'issue/2243' into develop
2015-09-14 11:56:38 +03:00
AlexVinS
329c1d6b94
Calculate magic mirror effect at same time as magic resistance.
2015-09-14 11:52:56 +03:00
AlexVinS
caf8ae62cc
Allow custom effect animation on any stack during spell cast.
2015-09-14 06:21:49 +03:00
AlexVinS
0f0e67dbe3
Do not include resisted stacks in affected
2015-09-14 05:45:05 +03:00
AlexVinS
6374eaef7a
Merge branch 'SpellsRefactoring6' into develop
2015-09-14 03:28:17 +03:00
AlexVinS
843a2a39bd
Use general dispell algorithm for CURE
2015-09-13 01:06:07 +03:00
AlexVinS
32337102ac
Fix a typo
2015-09-13 00:54:39 +03:00
AlexVinS
9d0a1f0eef
Added logging for CDummyAnimation creation (like other types)
2015-09-13 00:01:36 +03:00
AlexVinS
3029b1a432
Fix initialization of CSpell::AnimationItem
2015-09-12 23:52:04 +03:00
AlexVinS
cbd8900c0b
Added CBattleConsole tracing
2015-09-12 23:03:45 +03:00
AlexVinS
f310be5d5f
Fix pasring csv cells with multiple quoted parts
2015-09-12 23:03:10 +03:00
AlexVinS
e9c3bc9df6
Fix after rebase
2015-09-12 21:09:54 +03:00
AlexVinS
7776d7bbf7
rename BattleSpellCastParameters::caster
2015-09-12 21:09:54 +03:00
AlexVinS
075b65b31b
Use dummy animations
2015-09-12 21:09:53 +03:00
AlexVinS
98ea8bf314
Introduce dummy spell animation/ animation pause configuration
...
* save format changed with backward compatibility, UNTESTED
2015-09-12 21:09:52 +03:00
AlexVinS
832d69ec11
Hide battle log algorithm in spell classes.
...
* not finished, to be moved to json of splitted between mechanics classes
2015-09-12 21:09:51 +03:00
AlexVinS
5d0ecd9cdf
More battle log refactoring
2015-09-12 21:09:50 +03:00
AlexVinS
7cf9bd36b7
Display AGE effect with any value (not only -50%).
2015-09-12 21:09:49 +03:00
AlexVinS
786acad70b
project update
2015-09-12 21:09:49 +03:00
AlexVinS
3a5a02e73b
Use boost::fromat in CBattleInterface::spellCast
2015-09-12 21:09:48 +03:00
AlexVinS
805c839761
More CBattleInterface::spellCast refactoring
2015-09-12 21:09:47 +03:00
AlexVinS
8171924eb4
More simplification of CBattleInterface::spellCast
...
* was started in previous branch
2015-09-12 21:09:46 +03:00
AlexVinS
9482852020
few tweaks
2015-09-12 21:09:45 +03:00
AlexVinS
fb5903d610
Initial experiments on hero & creature casting unification
2015-09-12 21:09:44 +03:00
AlexVinS
28087099b8
More correct usage of SDL_Palette
2015-09-05 15:03:37 +03:00
AlexVinS
8f2da66a18
fix mantiss 1967 + some refactoring
...
* remove TModDescr and realted APIs - they were only used in one place
2015-09-04 22:29:20 +03:00
AlexVinS
e82dfb5a85
fixed mantiss 0002254
2015-09-04 18:08:25 +03:00
AlexVinS
1510f1f14c
CQuestLog: boost::bind->std::bind
2015-09-02 20:00:56 +03:00
AlexVinS
b512005d38
Get rid of CSDL_Ext::colorSetAlpha
2015-09-02 18:49:29 +03:00
AlexVinS
e80c8d16a6
Cleanup CDefHandler
2015-09-02 18:27:56 +03:00
DjWarmonger
2012d53dd6
Fixed issues with exchanging combo artifacts ( #2132 ).
2015-08-30 15:15:04 +02:00
DjWarmonger
6af8db2c69
Fixed logic discrepancy for (in)visible objects. Fixes #2224 , #2225 and possibly more.
2015-08-30 09:14:54 +02:00
Ivan Savenko
aefe5923fd
update sdl packages for Ubuntu/Debian to 2.0
2015-08-30 00:10:35 +03:00
Ivan Savenko
1066330925
update minimal boost version
2015-08-30 00:01:57 +03:00
DjWarmonger
a8c9727a5b
Merge pull request #116 from DavidZeni/issue/2137
...
Okay, thank you for your contribution :)
2015-08-29 22:10:24 +02:00
David Zéni
41293caf83
Fix bad formatting
2015-08-29 20:02:27 +02:00
David Zéni
b49fb7d07f
Refactor actions for Catapult
...
No target -> Pass
No player or no ballistics -> automatic action
Else -> manual action
2015-08-27 23:03:48 +02:00
David Zéni
bd52a0d3e4
Merge branch 'develop' into issue/2137
2015-08-26 21:08:20 +02:00
David Zéni
f84e5cf8b3
When hero has ballistics and no target pass turn
2015-08-26 20:54:24 +02:00
DjWarmonger
ee08e6be79
Merge pull request #115 from bwrsandman/creature-garisson-tooltip
...
Looks good to me, merging.
2015-08-26 15:51:07 +02:00
Sandy Carter
a79ade7d44
Garrison: Move all but one creature when last slot
2015-08-26 08:44:23 -04:00
Sandy Carter
dafc40d896
Garrison: Fix selection behaviour when swapping with ally
2015-08-26 08:40:00 -04:00
Sandy Carter
a89ef88ce3
Garrison: Factor complex if statement to functions
2015-08-26 08:40:00 -04:00
Sandy Carter
cd13807115
Garrison: Clarify upg by turning into a class enum
2015-08-26 08:39:57 -04:00
Sandy Carter
b008d24c68
Garrison: Refactor Left Click
...
Restructure large nested if statements into more shallow blocks
Factor out contents of if statements to functions for better readability
* viewInfo
* hightlightOrDropArtifact
* split
2015-08-25 09:47:23 -04:00
Sandy Carter
3d327e650a
Garrison: Boyscouting: simplify clickLeft
2015-08-25 09:47:23 -04:00
Sandy Carter
c02700853a
Garrison: Disable split buttons when visiting ally
2015-08-25 09:47:23 -04:00
Sandy Carter
742f244426
Garisson: Documentation: Convert comments to doc
2015-08-25 09:47:23 -04:00
Sandy Carter
6ffb03cba3
Garrison: Documentation for our() and ally()
2015-08-25 09:47:21 -04:00