Arseniy Shestakov
faae305ec0
CTradeWindow: avoid crash when right click on artifact
...
Fix suggested by @argarak in PR #199
2016-03-12 03:19:38 +03:00
DjWarmonger
fe4d871fe7
Version bump.
2016-03-01 19:42:40 +01:00
ArseniyShestakov
7886e8986e
Merge pull request #197 from vcmi/issue/2304_2418
...
Issues/2304/2418/2293
2016-03-01 15:20:59 +03:00
AlexVinS
3873e5047e
Attempt to fix 2293
2016-03-01 13:24:46 +03:00
AlexVinS
e3e27b9bfe
Move ghost creation to inner battle loop
2016-03-01 11:07:45 +03:00
DjWarmonger
8f1fba9551
Merge pull request #146 from vcmi/feature/VCMIMapFormat1
...
Ok let's try it.
2016-03-01 07:49:54 +01:00
AlexVinS
42af83f0dd
Added todo note about ghost stack fadeout
2016-03-01 05:39:04 +03:00
AlexVinS
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
AlexVinS
5c716f6581
Fix hackfix for ghost stack drawing
2016-03-01 04:41:51 +03:00
AlexVinS
277211e569
Fix summoning block by clones.
2016-03-01 04:16:51 +03:00
AlexVinS
2c48c95c8d
Fix casualties calculation for commander
2016-03-01 04:06:32 +03:00
AlexVinS
94770e7598
Cleanup
2016-03-01 03:09:50 +03:00
DjWarmonger
772bc9e6c1
Updated MSVS project files.
2016-02-29 16:32:29 +01:00
AlexVinS
ace52cfdb1
Hackfix for ghost stack draw.
2016-02-29 05:09:13 +03:00
AlexVinS
f890037008
Fixes
2016-02-29 04:42:15 +03:00
AlexVinS
97504364e4
Rtmoved unused method BattleInfo::getStackT
2016-02-28 19:00:37 +03:00
AlexVinS
5df8d1cbd0
Update low level battle stacks accessor for ghost selection support.
2016-02-28 05:10:20 +03:00
AlexVinS
47b619a543
Centralize GHOST state handling
2016-02-28 01:35:23 +03:00
AlexVinS
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
AlexVinS
5d5ad99436
Rename DEAD_CLONE -> GHOST, as this will be possible for any stack
2016-02-28 00:13:34 +03:00
AlexVinS
d2a5e64542
Remove clone of killed or removed creature. Treat summoned creature as clone when killed.
2016-02-27 18:39:37 +03:00
Arseniy Shestakov
30189a386f
CPathfinder: fix and improve sail-land transition checks
2016-02-26 21:43:43 +03:00
AlexVinS
5408b6c1ff
Formatting
2016-02-26 18:19:41 +03:00
AlexVinS
66d8408130
Fix creature set loading
2016-02-26 02:35:30 +03:00
AlexVinS
8e3e574900
Fix map object appearance serialization
2016-02-26 02:03:14 +03:00
AlexVinS
0de1a37d65
Fix missing template zIndex saving
2016-02-26 01:01:07 +03:00
AlexVinS
4a37ed99ea
Fix duplicated block-visit regression
2016-02-26 00:42:49 +03:00
AlexVinS
2021decb91
Serialize town spells
2016-02-25 22:59:17 +03:00
Arseniy Shestakov
5778082842
VCAI: dont visit border guard if tent not visited. Fix issue 1590
...
CQuest::checkQuest cant be used for border guard since CGKeys not yet work using quests.
Currently border guard have MISSION_NONE quest that always return true and make AI stuck.
2016-02-25 08:40:28 +03:00
Arseniy Shestakov
4f7664926e
New console commands for AI debugging: gosolo and controlai
...
gosolo: make AI to take over every human player in game. Second command would give control back to CPlayerInterface.
controlai: give control of one or all AI players to CPlayerInterface. Command "controlai orange" turn orange to human player while "controlai" without color specified make all AIs human controlled players.
2016-02-25 00:38:10 +03:00
AlexVinS
8b6cf82a01
Fix
2016-02-24 02:59:34 +03:00
AlexVinS
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
AlexVinS
c3775486db
Serizlize main town info
2016-02-23 23:23:39 +03:00
AlexVinS
17e557be17
Advance Logical identifier condition
2016-02-23 16:36:21 +03:00
DjWarmonger
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
AlexVinS
8ed6aa762b
fix
2016-02-23 01:14:06 +03:00
AlexVinS
4bcfb8c27d
Draft of new Event conditions
2016-02-22 23:43:57 +03:00
ArseniyShestakov
7f1ddc4a98
Merge pull request #196 from vcmi/feature/armiesMerging
...
Feature/armies merging
2016-02-22 19:55:03 +03:00
AlexVinS
dc5ad7d7b3
Make string instance names persistent
2016-02-22 19:26:42 +03:00
AlexVinS
ac281f3fec
Tweaks
2016-02-22 04:53:14 +03:00
Arseniy Shestakov
f8c6751707
CGameHandler::endBattle: change town ownership when hero lost siege
2016-02-22 03:35:38 +03:00
Arseniy Shestakov
9428f865d3
CGTownInstance: erase all stacks when town is captured by enemy
2016-02-22 03:33:15 +03:00
AlexVinS
64cb0267a3
Do not save "visitableFrom" if object do not have active tiles.
2016-02-22 03:22:10 +03:00
AlexVinS
51bee1000b
Implemented CGWitchHut::serializeJsonOptions
2016-02-22 03:16:33 +03:00
AlexVinS
939e0128fd
Do not save default json values
2016-02-22 02:50:06 +03:00
Arseniy Shestakov
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
AlexVinS
dd1aabbe23
Use JsonSerializeFormat for map objects
2016-02-22 02:37:19 +03:00
AlexVinS
15a4a11560
Tweak tests
2016-02-21 22:25:31 +03:00
AlexVinS
a4b6d34ebe
Advance map header serialization
2016-02-21 22:13:20 +03:00
AlexVinS
4ebafa17b4
Remove unused placeholdedHeroes field
2016-02-21 22:12:58 +03:00
