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 |
|
AlexVinS
|
53b5587c2e
|
Advance map header serialization
|
2016-02-21 21:21:22 +03:00 |
|
AlexVinS
|
7eb8dbe0e9
|
Fix serializer backward compatibility in CPointerLoader
|
2016-02-18 18:45:42 +03:00 |
|
AlexVinS
|
b6103167f7
|
Fix serializer backward compatibility in CPointerLoader
|
2016-02-18 18:08:05 +03:00 |
|
AlexVinS
|
36121696ca
|
Clenaup
|
2016-02-18 17:48:04 +03:00 |
|
Arseniy Shestakov
|
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 |
|
AlexVinS
|
5a8ee32f89
|
Tweaks
|
2016-02-15 18:16:45 +03:00 |
|
AlexVinS
|
150fcc9422
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
|
2016-02-15 13:39:00 +03:00 |
|
AlexVinS
|
4d9058e412
|
Whitespace cleanup. (No code changes.)
|
2016-02-15 13:34:37 +03:00 |
|
AlexVinS
|
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 |
|
ArseniyShestakov
|
c550484613
|
Merge pull request #181 from vcmi/feature/drawbridgeMechanics
Feature/drawbridge mechanics
|
2016-02-14 16:32:24 +03:00 |
|
Arseniy Shestakov
|
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 |
|
Arseniy Shestakov
|
2cfdfca7e5
|
Battles: fix more cases where invalid wall hex position present
|
2016-02-14 14:38:24 +03:00 |
|
AlexVinS
|
67b03b9658
|
Fixed remaining tempOwner testsю
|
2016-02-14 12:25:49 +03:00 |
|
AlexVinS
|
fb322b41bc
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
|
2016-02-14 12:14:57 +03:00 |
|
AlexVinS
|
800f32c4cb
|
Fix few cases of tempOwner initialization.
|
2016-02-14 12:13:30 +03:00 |
|
AlexVinS
|
709dd833d5
|
Added hacks for hero identification.
|
2016-02-14 11:25:01 +03:00 |
|
AlexVinS
|
e0af4a665a
|
Added hacks fot spell scroll support.
|
2016-02-13 19:43:05 +03:00 |
|
AlexVinS
|
7106c5d1af
|
Fix loading of spell identifier
|
2016-02-13 19:41:28 +03:00 |
|
Arseniy Shestakov
|
d4524c2fbd
|
CGDwelling: dont set owner for Refugee Camp. Fix issue 2029
|
2016-02-13 19:26:47 +03:00 |
|
Arseniy Shestakov
|
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 |
|
AlexVinS
|
a59f0c23ce
|
Dedug tweaks
|
2016-02-13 17:16:00 +03:00 |
|
Arseniy Shestakov
|
b946c52242
|
CBattleInterface: introduce EWallVisual instead of ids with comments
|
2016-02-13 17:10:14 +03:00 |
|
AlexVinS
|
5a92e0de2b
|
Small redesign
|
2016-02-13 16:28:07 +03:00 |
|
AlexVinS
|
22b93106c8
|
Experimental drafts of Json serializer
|
2016-02-13 15:04:32 +03:00 |
|
AlexVinS
|
a307d3ca40
|
tweaks
|
2016-02-10 13:24:03 +03:00 |
|
AlexVinS
|
fb17914ae5
|
Debug tweaks
|
2016-02-10 08:59:24 +03:00 |
|
AlexVinS
|
3c78f960cd
|
Complete json map format integration
|
2016-02-10 07:28:00 +03:00 |
|
Arseniy Shestakov
|
422d5cabdf
|
CBattleInterface: first pass on client drawbridge visualization
|
2016-02-10 07:10:32 +03:00 |
|
AlexVinS
|
0c21efb202
|
Start integration of map format into engine
|
2016-02-09 20:20:03 +03:00 |
|
Arseniy Shestakov
|
11dc428b1e
|
Battles: move hexes enum to GameConstants and fix wall position
Before we had hex 62 marked as destructible wall while actually it's must be 78.
|
2016-02-09 17:38:59 +03:00 |
|
DjWarmonger
|
d775e40eba
|
Fixed typo.
|
2016-02-09 15:15:45 +01:00 |
|
Arseniy Shestakov
|
01b4d0ae01
|
Battles: better handling for walking double-wide creatures
Request opening of gate even if only second half of double-wide stack going to stop on it.
|
2016-02-09 15:41:37 +03:00 |
|
DjWarmonger
|
4de0f0f973
|
Compile fixes for MSVS.
|
2016-02-09 11:08:20 +01:00 |
|