1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Commit Graph

229 Commits

Author SHA1 Message Date
c550484613 Merge pull request #181 from vcmi/feature/drawbridgeMechanics
Feature/drawbridge mechanics
2016-02-14 16:32:24 +03:00
f453172d53 CBattleInterface: cleaner implementation of optional drawbridge blit
Checking against nullptr isn't clean solution so we only blit in case gate opened or destroyed.
2016-02-14 15:38:58 +03:00
2cfdfca7e5 Battles: fix more cases where invalid wall hex position present 2016-02-14 14:38:24 +03:00
c5cfc8467f Battles: change naming from drawbridge to gate for everything
This way code is shorter and cleaner while in future we may support towns with gate only.
2016-02-13 17:40:31 +03:00
b946c52242 CBattleInterface: introduce EWallVisual instead of ids with comments 2016-02-13 17:10:14 +03:00
422d5cabdf CBattleInterface: first pass on client drawbridge visualization 2016-02-10 07:10:32 +03:00
ba017c443d Start from diff of pull request #124 from vcmi/issue/1372 2016-01-29 21:05:17 +03:00
40cb48d65e Replace std::remove_if with vstd::erase_if 2016-01-26 10:19:58 +03:00
9fd1cff090 Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.

This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
e645b46aed Revert "Merge pull request #124 from vcmi/issue/1372"
This reverts commit da01af319b, reversing
changes made to 8b6b4e2e0b.
2015-11-07 11:35:02 +03:00
4b5cb3599a Do not try to rise demons from war machines 2015-11-03 02:20:26 +03:00
6a9dc78dcd [WiP]Added some checks for RISE_DEMONS action. 2015-11-03 02:18:36 +03:00
2677d4a677 Fixed action cancel on active stack remove 2015-10-08 08:15:29 +03:00
f99bf099ca Made player interface tolerant to active stack removal. 2015-10-06 03:46:35 +03:00
a06e34cf61 Cleanup 2015-09-29 19:14:24 +03:00
70d9be8447 Use ISpellCaster in battle callback 2015-09-29 17:26:52 +03:00
d9cbe487c7 remove useless function CSpell::getTargetInfo 2015-09-29 17:26:47 +03:00
2b434111bf More hero|creature casting unification 2015-09-29 17:26:40 +03:00
92990c887c Fix creatures can always cast on self 2015-09-29 17:26:37 +03:00
caf8ae62cc Allow custom effect animation on any stack during spell cast. 2015-09-14 06:21:49 +03:00
0f0e67dbe3 Do not include resisted stacks in affected 2015-09-14 05:45:05 +03:00
075b65b31b Use dummy animations 2015-09-12 21:09:53 +03:00
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
5d0ecd9cdf More battle log refactoring 2015-09-12 21:09:50 +03:00
7cf9bd36b7 Display AGE effect with any value (not only -50%). 2015-09-12 21:09:49 +03:00
3a5a02e73b Use boost::fromat in CBattleInterface::spellCast 2015-09-12 21:09:48 +03:00
805c839761 More CBattleInterface::spellCast refactoring 2015-09-12 21:09:47 +03:00
8171924eb4 More simplification of CBattleInterface::spellCast
* was started in previous branch
2015-09-12 21:09:46 +03:00
9482852020 few tweaks 2015-09-12 21:09:45 +03:00
fb5903d610 Initial experiments on hero & creature casting unification 2015-09-12 21:09:44 +03:00
2cb6cb7baa Remove useless durationType selector
* duration is a mask, equality comparison is not enough
2015-06-02 07:12:02 +03:00
e1deff089d Actually use ANY_CREATURE possible action
* this fixes mantiss 0002140
2015-04-11 10:56:35 +03:00
a061e3c2f7 Fix use-after-free in spell window 2015-04-11 10:18:40 +03:00
Fay
1cb54689cf Prevents first aid tents from melee attacking;
Moves attack possibility checks to battle callback (for consistency with shooting checks);
2015-04-09 21:49:11 +02:00
67a7cd8350 Allow FREE_LOCATION action over dead stack. This fixes 0001560 2015-03-29 16:24:43 +03:00
9600446cf9 +smart target, +hit animation 2015-03-18 17:48:32 +03:00
69c458e881 initial implementation. 2015-03-18 13:27:07 +03:00
025a00362b Simplify CBattleInterface::spellCast 2015-02-26 08:39:58 +03:00
685deddac1 Start spell-relatet files reorganisation
* moved existing files to separate directory
-> todo: split mechanics
2015-02-26 08:39:48 +03:00
a3f2667376 Remove some deprecated fields from CSpell
* now only new SpellScholl API is used
(!) untested
2015-02-26 08:39:43 +03:00
Fay
4b5b6edd44 Added space between both text entries; 2015-01-26 17:16:39 +01:00
Fay
413523956f Fixed missing info about dealt damage in combat log when there were casualties;
Fixed blank row in combat log in the same case;
2015-01-25 18:03:34 +01:00
d94f15bdf4 Added configurable animation for SPELL_LIKE_ATTACK 2014-11-28 00:36:14 +03:00
943a5bf0d3 cleanup 2014-11-27 22:10:36 +03:00
0612042928 Tweak creature spell projectile start position
* need more finetuning
2014-11-27 21:33:57 +03:00
04202eb030 Shoot spell projectile from creature 2014-11-27 21:06:11 +03:00
657385e32c We need to know caster stack ID for proper projectile animation 2014-11-27 20:47:37 +03:00
6893509f65 Fix manaGain animation always showing 2014-11-27 19:09:59 +03:00
c67f52732a Fix CSpellEffectAnimation call parameters
(!) need check areaEffect usage
2014-11-27 17:39:37 +03:00
75b93b070d Implemented configurable hit/affect animation
* need more testing
2014-11-27 16:51:16 +03:00