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

287 Commits

Author SHA1 Message Date
384c5827ae Fixed CID 1197490, CID 1197491 2016-11-25 17:21:27 +03:00
ca13bb8412 Fixed CID 1366375, CID 1197633 2016-11-25 17:04:30 +03:00
4ba3c6fecc Fixed CID 1288855 2016-11-25 16:40:11 +03:00
1e60ba6516 Only delete CQuest in CMap destructor and not with IQuestObject
Quest information must remain accessible even if map object removed. Fix issue 2472
2016-09-13 01:30:47 +03:00
02f70464fb Fix mismatched-tags Clang warnings
They're not important at all, but sicne there only few of them left just fix them.
2016-09-08 19:42:59 +03:00
42e7128acc Fixed possible use-after-free crash with artifacts registration in RMG. 2016-09-08 14:48:48 +03:00
6dc47a2de0 Fixed use-after-free crash with quests registration in RMG.
* code taken from PR #200
2016-09-08 14:48:46 +03:00
437eadf1ed do not leak scenarioOpts in CMapInfo 2016-08-31 06:18:01 +03:00
452e28d183 Remove some useless includes found by cppclean
This of course was tested and shouldn't break anything
2016-08-26 04:42:16 +03:00
ec22da4412 CMap: fix objects memory leak on exit 2016-08-19 16:56:26 +03:00
2a9ddadedd Fixes. Everything works now. 2016-08-12 21:40:22 +02:00
9b58450cb0 Part 3 - first working draft, cut generation time by half. 2016-08-12 19:16:21 +02:00
19ea46a6d2 Part 2. 2016-08-11 09:20:50 +02: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
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
8e3e574900 Fix map object appearance serialization 2016-02-26 02:03:14 +03:00
4a37ed99ea Fix duplicated block-visit regression 2016-02-26 00:42:49 +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
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
51bee1000b Implemented CGWitchHut::serializeJsonOptions 2016-02-22 03:16:33 +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
36121696ca Clenaup 2016-02-18 17:48:04 +03:00
5a8ee32f89 Tweaks 2016-02-15 18:16:45 +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
e0af4a665a Added hacks fot spell scroll support. 2016-02-13 19:43:05 +03:00
a59f0c23ce Dedug tweaks 2016-02-13 17:16:00 +03:00
5a92e0de2b Small redesign 2016-02-13 16:28:07 +03:00
22b93106c8 Experimental drafts of Json serializer 2016-02-13 15:04:32 +03:00
a307d3ca40 tweaks 2016-02-10 13:24:03 +03:00
fb17914ae5 Debug tweaks 2016-02-10 08:59:24 +03:00
3c78f960cd Complete json map format integration 2016-02-10 07:28:00 +03:00
0c21efb202 Start integration of map format into engine 2016-02-09 20:20:03 +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
8d7629bdab Fix unused function warning in release mode 2016-02-02 11:12:28 +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
408f346541 Drafts for hero serialization 2016-01-24 15:35:08 +03:00
3eb9de0c0b Grail options serialization 2016-01-24 02:26:32 +03:00
a638d0cd51 Creature set serialization 2016-01-15 20:24:17 +03:00
37d0dad70a Merge branch 'develop' into feature/VCMIMapFormat1
Conflicts:
	lib/CArtHandler.cpp
2016-01-01 20:28:52 +03:00