b0045fa357
Fix TurnInfo memory leaks
2016-08-16 15:47:21 +03:00
2410f0af61
- WeightedRule optimization - part 1
...
- comments, style
2016-08-11 07:49:08 +02:00
2bffd4e5c1
Moar optimization!
2016-08-09 13:40:46 +02:00
201ed26795
Fixed #1213
2016-06-06 09:30:45 +02: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
8f1fba9551
Merge pull request #146 from vcmi/feature/VCMIMapFormat1
...
Ok let's try it.
2016-03-01 07:49:54 +01:00
5408b6c1ff
Formatting
2016-02-26 18:19:41 +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
2021decb91
Serialize town spells
2016-02-25 22:59:17 +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
17e557be17
Advance Logical identifier condition
2016-02-23 16:36:21 +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
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
53b5587c2e
Advance map header serialization
2016-02-21 21:21:22 +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
4d9058e412
Whitespace cleanup. (No code changes.)
2016-02-15 13:34:37 +03:00
67b03b9658
Fixed remaining tempOwner testsю
2016-02-14 12:25:49 +03:00
fb322b41bc
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
2016-02-14 12:14:57 +03:00
800f32c4cb
Fix few cases of tempOwner initialization.
2016-02-14 12:13:30 +03:00
709dd833d5
Added hacks for hero identification.
2016-02-14 11:25:01 +03:00
e0af4a665a
Added hacks fot spell scroll support.
2016-02-13 19:43:05 +03:00
d4524c2fbd
CGDwelling: dont set owner for Refugee Camp. Fix issue 2029
2016-02-13 19:26:47 +03:00
a59f0c23ce
Dedug tweaks
2016-02-13 17:16:00 +03:00
fb17914ae5
Debug tweaks
2016-02-10 08:59:24 +03:00
6db94ab74c
Explicit army serialization - too much CArmedInstance descendants
2016-02-09 10:11:59 +03:00
53dc49e92a
CGShipyard, CGShrine serialization
2016-02-09 09:17:20 +03:00
401ba48257
CGScholar serialization
2016-02-09 09:02:34 +03:00
a00dbd3dd1
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CMakeLists.txt
lib/VCMI_lib.cbp
lib/filesystem/CFileInputStream.cpp
lib/filesystem/CZipLoader.cpp
lib/rmg/CRmgTemplateZone.cpp
vcmi.workspace
2016-02-08 10:17:25 +03:00
a13aec4fd7
Aplly some fix for merge and explicitly specify type for std::max
2016-02-08 04:09:02 +03:00
6f5706352d
Possible fix for #2371
2016-02-06 12:36:56 +01:00
081a20d047
Fix a crash.
2016-02-05 09:40:20 +03:00
483276b128
Merge fixes
2016-02-04 12:28:12 +03:00
6e205a58b4
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/VCMI_lib.cbp
lib/filesystem/CZipLoader.cpp
lib/filesystem/CZipLoader.h
lib/mapObjects/CGTownInstance.cpp
2016-02-04 10:27:51 +03:00
97f19b5176
CGResource serialization
2016-02-04 09:22:14 +03:00
d8d574ed84
CGSignBottle serialization
2016-02-04 08:50:46 +03:00
a6c719ee11
CGCreature serialization. Added rewardResources.
2016-02-04 08:44:46 +03:00
1bc41b3ba3
Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1
...
Conflicts:
lib/mapObjects/CGHeroInstance.cpp
2016-02-03 05:04:44 +03:00
b176734418
CGCreature serialization
2016-02-03 04:18:03 +03:00
88bc21952b
Make stables message appear if hero has cavaliers but visited stables before
2016-02-01 09:41:15 +03:00
c30a6f2ff3
Fix 1989 cavaliers -> champions in stables
2016-01-31 21:09:11 +03:00
3926920103
Rename radious -> radius
...
There is no such English word, "radious"
Some files get new lines in the end - BSD sed bug + best practices
2016-01-31 18:01:58 +03:00
e18b21b78e
Fix 2264 learning stone & Learning skill
2016-01-31 10:12:01 +03:00
eb4331baf6
Fix 1916 water wheel reward
2016-01-30 19:11:22 +03:00
