Commit Graph

14 Commits (openmw-36)

Author SHA1 Message Date
scrawl dffa8c6c14 Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170) 10 years ago
scrawl 4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 10 years ago
scrawl 16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object
Fixes #1360
11 years ago
scrawl 3dceb7ee4f Fix overwriting DialInfo 11 years ago
scrawl 0aa1042fd7 Optimized dialogue merging with a lookup map 11 years ago
scrawl 1677fcf324 Dialogue merging 11 years ago
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
11 years ago
Marc Zinnschlag adf3a41a83 added topic and journal tables 11 years ago
Marc Zinnschlag c42e74dadf make 4 byte record type accessable from record struct 11 years ago
Marc Zinnschlag 874ce26bef added missing consts to record save functions 11 years ago
greye 1339787863 remove underscores from filenames in esm 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Alexander "Ace" Olofsson ba602929ef Adding basic save functions to all record types. 13 years ago
Nikolay Kasyanov fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago