14107 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	c3031da20e	Tests: add content_diagnostics_test (requires some data files) ... (cherry picked from commit 771193bae8)	2015-12-05 11:26:37 +11:00
scrawl	c221be76dc	Tests: add dialogue_merging_test (requires some data files) ... (cherry picked from commit 38c155c579)	2015-12-05 11:26:24 +11:00
scrawl	f9e12d6fbd	Delete empty test ... (cherry picked from commit d0d8c2eded)	2015-12-05 11:26:11 +11:00
scrawl	25bb8a59ef	esmtool fix ... (cherry picked from commit 9116c701d5) Conflicts: apps/esmtool/record.cpp	2015-12-05 11:25:59 +11:00
scrawl	41ee50c2b7	Move common subrecord definitions (NAME, DELE) to defs.hpp ... (cherry picked from commit fc8e40889d)	2015-12-05 11:25:14 +11:00
Stanislav Bas	d789d9369c	Make saving of deleted ESM records more consistent ... (cherry picked from commit f9b0b7ede5)	2015-12-05 11:24:21 +11:00
Stanislav Bas	3821bffbfa	Fix missing break in switch statement ... (cherry picked from commit 9a8ca81907)	2015-12-05 11:24:09 +11:00
Stanislav Bas	2abdeef2e0	Remove unused includes ... (cherry picked from commit daaff1284e) Conflicts: apps/openmw/mwworld/store.cpp components/esm/util.hpp	2015-12-05 11:23:57 +11:00
Stanislav Bas	38e99c9cd4	Load methods (for ESM records) accept a deleted flag in ESSImporter ... (cherry picked from commit 0c6ab6cc94)	2015-12-05 11:23:24 +11:00
Stanislav Bas	0c4dd48394	Load methods (for ESM records) accept a deleted flag in ESMTool ... (cherry picked from commit 8243fb2479) Conflicts: apps/esmtool/record.cpp	2015-12-05 11:23:12 +11:00
Stanislav Bas	f4587e48f3	Load methods (for ESM records) accept a deleted flag in OpenCS ... (cherry picked from commit 13bb6be238) Conflicts: apps/opencs/model/doc/savingstages.cpp apps/opencs/model/world/land.cpp apps/opencs/model/world/land.hpp apps/opencs/model/world/landtexture.cpp	2015-12-05 11:22:51 +11:00
Stanislav Bas	0c002dd6de	Load/read methods (for ESM records) accept a deleted flag in OpenMW ... (cherry picked from commit 67c8f95c4e) Conflicts: apps/openmw/mwworld/store.cpp	2015-12-05 11:20:55 +11:00
Stanislav Bas	82363bf318	Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records ... (cherry picked from commit 4a16eba716) Conflicts: components/esm/loadland.cpp components/esm/loadland.hpp	2015-12-05 11:20:31 +11:00
Stanislav Bas	7013ba751c	Fix build errors & warnings ... (cherry picked from commit 1e8182220a)	2015-12-05 11:19:22 +11:00
Stanislav Bas	d12f784e7e	Remove <cstdint> include file from loaddial.cpp ... (cherry picked from commit f5745749a6)	2015-12-05 11:19:11 +11:00
Stanislav Bas	a3d48fd482	Rework ESS importer code. Remove explicit NAME handling for ESM records ... (cherry picked from commit 6b21da7f8e)	2015-12-05 11:18:57 +11:00
Stanislav Bas	459fe3da52	Rework EsmTool code. Remove explicit NAME handling ... (cherry picked from commit ede4bfcf52) Conflicts: apps/esmtool/record.cpp	2015-12-05 11:18:46 +11:00
Stanislav Bas	0277a4e8c4	Implement saving of deleted records ... (cherry picked from commit 8e6a7be6f5) Conflicts: apps/opencs/model/doc/savingstages.cpp	2015-12-05 11:18:15 +11:00
Stanislav Bas	a120bb2b54	Delete infos of deleted dialogue when loading a content file ... (cherry picked from commit e04e32bcff)	2015-12-05 09:46:53 +11:00
Stanislav Bas	9a803739ff	Add a separate method to check whether a record is deleted or not for IdCollection ... (cherry picked from commit a4d3e59e5c)	2015-12-05 09:46:40 +11:00
Stanislav Bas	696f7a942b	Some refactoring. Remove unused code ... (cherry picked from commit 5fd48efd28) Conflicts: apps/openmw/mwworld/store.cpp	2015-12-05 09:46:20 +11:00
Stanislav Bas	b5c958c62a	More ESM records have DELE handling. ... Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter (cherry picked from commit e65ff723ce) Conflicts: components/esm/loadland.cpp components/esm/loadland.hpp	2015-12-05 09:17:40 +11:00
Stanislav Bas	8b7b3d2a4e	Refine DELE handling in ESM records. Add position-independent DELE search ... (cherry picked from commit ad353e6dd0)	2015-12-05 07:20:36 +11:00
Stanislav Bas	4e199697cc	Handle deleted records in RefCollection ... (cherry picked from commit 3ba73f5fd9)	2015-12-05 07:20:22 +11:00
Stanislav Bas	3686c1e32d	Move DELE handling to CellRef record ... (cherry picked from commit e8a9567be3)	2015-12-05 07:20:09 +11:00
Stanislav Bas	9503104129	Return a correct index for a loaded record that was deleted ... (cherry picked from commit a1389b87ba)	2015-12-05 07:19:55 +11:00
Stanislav Bas	0979d88b0c	Rework RefIdData code. Update the index map when a new record is loaded ... (cherry picked from commit 5e623a2a1d)	2015-12-05 07:19:43 +11:00
Stanislav Bas	82e1b0563c	Add NAME handling to DebugProfile and Filter records ... (cherry picked from commit b55a4999ca)	2015-12-05 07:19:32 +11:00
Stanislav Bas	bd695feded	Remove INAM handling from InfoCollection ... (cherry picked from commit 71e5fc7f04)	2015-12-05 07:19:18 +11:00
Stanislav Bas	72152d84ed	Move ID loading into a separate method for Dialogue and DialInfo records ... (cherry picked from commit c8c79dc1ef) Conflicts: apps/openmw/mwworld/store.cpp	2015-12-05 07:19:07 +11:00
Stanislav Bas	d518d70212	Remove NAME and DELE handling from IdCollection ... (cherry picked from commit 74a055f3cc)	2015-12-05 07:18:39 +11:00
Stanislav Bas	639e6e1c56	Remove DELE and NAME handling from RefIdCollection and RefIdData ... (cherry picked from commit 42f9136141)	2015-12-05 07:18:27 +11:00
Stanislav Bas	377d606fc3	Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) ... (cherry picked from commit c266315a35) Conflicts: apps/openmw/mwworld/store.cpp apps/openmw/mwworld/store.hpp	2015-12-05 07:17:56 +11:00
Stanislav Bas	2448aa05cb	Add removing of deleted Infos to Dialogue::clearDeletedInfos() ... (cherry picked from commit adec0cb61d)	2015-12-05 07:09:23 +11:00
Stanislav Bas	25a8cda9ac	Some fixes for ESM Dialogues and Infos ... (cherry picked from commit e0983c815c)	2015-12-05 07:09:05 +11:00
Stanislav Bas	80074f90bf	Set Deleted flag to false when initializing ESM records ... (cherry picked from commit 7ecb54a776)	2015-12-05 07:08:50 +11:00
Stanislav Bas	19acd1fada	Letter case fix for MWWorld::Globals ... (cherry picked from commit 20723581a1)	2015-12-05 07:08:30 +11:00
Stanislav Bas	a46ea70d65	Convert IDs of loaded records to lower case in MWWorld::Store ... (cherry picked from commit 00bf87b561)	2015-12-05 07:08:17 +11:00
Stanislav Bas	f8b0cfc637	Remove NAME handling from MWWorld::Globals ... (cherry picked from commit 897a52cdda)	2015-12-05 07:08:00 +11:00
Stanislav Bas	2564eb9841	Remove NAME handling from MWWorld::ESMStore ... (cherry picked from commit 9301bc148e)	2015-12-05 07:07:43 +11:00
Stanislav Bas	e0d5208d26	Remove explicit record ID in load/read methods of MWWorld::Store ... (cherry picked from commit 89e44c8f1f)	2015-12-05 07:07:14 +11:00
Stanislav Bas	c4fd4be3ea	Add NAME handling to GameSetting record ... (cherry picked from commit b2f3ccb080)	2015-12-05 07:05:41 +11:00
Stanislav Bas	711d787939	Add NAME and DELE handling to Global record ... (cherry picked from commit 09a3358017)	2015-12-05 07:05:28 +11:00
Stanislav Bas	1aa1336dcf	Remove redundant code ... (cherry picked from commit 30b42bf4c0)	2015-12-05 07:00:07 +11:00
Stanislav Bas	4f1601fe0d	Add NAME handling to Race record ... (cherry picked from commit 8c3654af11)	2015-12-05 06:59:53 +11:00
Stanislav Bas	7dc0c9138f	Add NAME and DELE handling to Cell record ... (cherry picked from commit b667338a8f)	2015-12-05 06:59:39 +11:00
Stanislav Bas	8c77cafc35	Add DELE handling to Info record ... (cherry picked from commit 847614c26f)	2015-12-05 06:59:24 +11:00
Stanislav Bas	d89de1ba30	Add NAME and DELE handling to Dialogue record ... (cherry picked from commit 0b537186e5)	2015-12-05 06:59:12 +11:00
Stanislav Bas	93736e9a81	Change DELE sub-record value to 0 (4 bytes) ... (cherry picked from commit 19ac4e942a)	2015-12-05 06:59:01 +11:00
Stanislav Bas	1b21d1b5f7	Add NAME and DELE handling to Script record ... (cherry picked from commit d2c15647a3)	2015-12-05 06:58:47 +11:00