2e70d29479
CGameHandler::applyBattleEffects: improve Fire Shield support
...
Now damage is limited to total health of defending stack and clone have no file shield damage. In same time damage calculation is likely remain incorrect.
2016-03-14 15:28:17 +03:00
10dbbead2d
Fix indentation of logging code and around it
...
That wouldn't be as big issue if problem affected few files, but it everywhere in codebase.
Fixed it everywhere since in most files that is the only code with wrong indentation.
2016-03-12 04:46:21 +03:00
fe4d871fe7
Version bump.
2016-03-01 19:42:40 +01:00
7886e8986e
Merge pull request #197 from vcmi/issue/2304_2418
...
Issues/2304/2418/2293
2016-03-01 15:20:59 +03:00
3873e5047e
Attempt to fix 2293
2016-03-01 13:24:46 +03:00
8f1fba9551
Merge pull request #146 from vcmi/feature/VCMIMapFormat1
...
Ok let's try it.
2016-03-01 07:49:54 +01:00
4bf9036c7b
Ensure that ghost stacks are created only by BattleStacksRemoved packet.
...
This will allow client to receive notification.
2016-03-01 05:24:35 +03:00
277211e569
Fix summoning block by clones.
2016-03-01 04:16:51 +03:00
772bc9e6c1
Updated MSVS project files.
2016-02-29 16:32:29 +01:00
f890037008
Fixes
2016-02-29 04:42:15 +03:00
97504364e4
Rtmoved unused method BattleInfo::getStackT
2016-02-28 19:00:37 +03:00
5df8d1cbd0
Update low level battle stacks accessor for ghost selection support.
2016-02-28 05:10:20 +03:00
47b619a543
Centralize GHOST state handling
2016-02-28 01:35:23 +03:00
9036d39241
Do not remove battle stacks, make them ghosts instead.
...
* exclude ghost stacks from (hopefully all) get* results for now
2016-02-28 01:08:56 +03:00
5d5ad99436
Rename DEAD_CLONE -> GHOST, as this will be possible for any stack
2016-02-28 00:13:34 +03:00
d2a5e64542
Remove clone of killed or removed creature. Treat summoned creature as clone when killed.
2016-02-27 18:39:37 +03:00
30189a386f
CPathfinder: fix and improve sail-land transition checks
2016-02-26 21:43:43 +03:00
5408b6c1ff
Formatting
2016-02-26 18:19:41 +03:00
66d8408130
Fix creature set loading
2016-02-26 02:35:30 +03:00
8e3e574900
Fix map object appearance serialization
2016-02-26 02:03:14 +03:00
0de1a37d65
Fix missing template zIndex saving
2016-02-26 01:01:07 +03:00
4a37ed99ea
Fix duplicated block-visit regression
2016-02-26 00:42:49 +03:00
2021decb91
Serialize town spells
2016-02-25 22:59:17 +03:00
8b6cf82a01
Fix
2016-02-24 02:59:34 +03:00
d2f04332d0
Load object appearance and pos before addNewObject call, it is required for block-visit calculation.
...
Added a test for tile block-visit.
2016-02-24 00:44:17 +03:00
c3775486db
Serizlize main town info
2016-02-23 23:23:39 +03:00
17e557be17
Advance Logical identifier condition
2016-02-23 16:36:21 +03:00
fba1e86091
An experiment - instead of hard limit function use modulo wrap-around for zone placement. Should be more logical and give zones more space.
2016-02-23 12:11:25 +01:00
8ed6aa762b
fix
2016-02-23 01:14:06 +03:00
4bcfb8c27d
Draft of new Event conditions
2016-02-22 23:43:57 +03:00
dc5ad7d7b3
Make string instance names persistent
2016-02-22 19:26:42 +03:00
ac281f3fec
Tweaks
2016-02-22 04:53:14 +03:00
9428f865d3
CGTownInstance: erase all stacks when town is captured by enemy
2016-02-22 03:33:15 +03:00
64cb0267a3
Do not save "visitableFrom" if object do not have active tiles.
2016-02-22 03:22:10 +03:00
51bee1000b
Implemented CGWitchHut::serializeJsonOptions
2016-02-22 03:16:33 +03:00
939e0128fd
Do not save default json values
2016-02-22 02:50:06 +03:00
d15106bf63
CGTownInstance: implement armies merging on siege. Fix issue 169
...
Merging algorithm is replicate one from original game.
2016-02-22 02:46:31 +03:00
dd1aabbe23
Use JsonSerializeFormat for map objects
2016-02-22 02:37:19 +03:00
a4b6d34ebe
Advance map header serialization
2016-02-21 22:13:20 +03:00
4ebafa17b4
Remove unused placeholdedHeroes field
2016-02-21 22:12:58 +03:00
53b5587c2e
Advance map header serialization
2016-02-21 21:21:22 +03:00
7eb8dbe0e9
Fix serializer backward compatibility in CPointerLoader
2016-02-18 18:45:42 +03:00
b6103167f7
Fix serializer backward compatibility in CPointerLoader
2016-02-18 18:08:05 +03:00
36121696ca
Clenaup
2016-02-18 17:48:04 +03:00
07961766ca
CGPandoraBox: don't use giveCreatures object removal feature
...
For pandora box there's own removal function and for CGEvent based on it we sometimes don't want to remove object at all.
2016-02-17 11:28:54 +03:00
5a8ee32f89
Tweaks
2016-02-15 18:16:45 +03:00
150fcc9422
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
2016-02-15 13:39:00 +03:00
4d9058e412
Whitespace cleanup. (No code changes.)
2016-02-15 13:34:37 +03:00
ec760632a6
Advance Json serializer
...
* added bool, numeric and string support
* added some enum support
* PoC implementation of logical id condition
* Refactoring
2016-02-15 12:21:39 +03:00
c550484613
Merge pull request #181 from vcmi/feature/drawbridgeMechanics
...
Feature/drawbridge mechanics
2016-02-14 16:32:24 +03:00
