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
|
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
|
d12f784e7e
|
Remove <cstdint> include file from loaddial.cpp
(cherry picked from commit f5745749a6)
|
2015-12-05 11:19:11 +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
|
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
|
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
|
d89de1ba30
|
Add NAME and DELE handling to Dialogue record
(cherry picked from commit 0b537186e5)
|
2015-12-05 06:59:12 +11:00 |
|
scrawl
|
dffa8c6c14
|
Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170)
|
2014-11-30 22:02:25 +01:00 |
|
scrawl
|
4047e3c928
|
Properly handle DialInfo records that were marked as Deleted (Fixes #2035)
|
2014-10-19 17:46:28 +02:00 |
|
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 |
|