12 commits

Author	SHA1	Message	Date
scrawl	16ac6e7aac	Merge DialInfo objects by subrecord instead of overwriting the object ... Fixes #1360	2014-05-31 13:01:11 +02:00
scrawl	3dceb7ee4f	Fix overwriting DialInfo	2014-05-18 18:58:32 +02:00
scrawl	0aa1042fd7	Optimized dialogue merging with a lookup map	2014-05-18 16:01:16 +02:00
scrawl	1677fcf324	Dialogue merging	2014-05-18 15:25:16 +02:00
Marc Zinnschlag	c995533e07	Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp	2013-10-21 16:45:43 +02:00
Marc Zinnschlag	adf3a41a83	added topic and journal tables	2013-10-20 17:15:32 +02:00
Marc Zinnschlag	c42e74dadf	make 4 byte record type accessable from record struct	2013-09-24 13:17:28 +02:00
Marc Zinnschlag	874ce26bef	added missing consts to record save functions	2013-09-16 12:32:35 +02:00
greye	1339787863	remove underscores from filenames in esm	2012-09-23 23:12:10 +04:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Alexander "Ace" Olofsson	ba602929ef	Adding basic save functions to all record types.	2012-04-06 21:04:30 +02:00
Nikolay Kasyanov	fcfe267fc9	Refactored remaining headers in components/esm except defs.hpp. ... Removed obsolete *.cpp files.	2011-04-28 21:55:05 +02:00