1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 18:37:08 +00:00
OpenMW/apps/opencs/model/world
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
..
cell.cpp fixed reference loading code (editor) 2013-08-29 13:27:54 +02:00
cell.hpp
collection.hpp changed ID listing to include deleted records by default 2013-09-19 13:42:19 +02:00
collectionbase.cpp moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase 2013-09-27 15:04:09 +02:00
collectionbase.hpp moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase 2013-09-27 15:04:09 +02:00
columnbase.cpp
columnbase.hpp added dialogue type column to topics table 2013-10-20 17:26:09 +02:00
columnimp.hpp Merge branch 'dialogue' into saving 2013-10-21 16:45:43 +02:00
columns.cpp Merge branch 'dialogue' into saving 2013-10-21 16:45:43 +02:00
columns.hpp Merge branch 'dialogue' into saving 2013-10-21 16:45:43 +02:00
commands.cpp
commands.hpp
data.cpp Merge branch 'dialogue' into saving 2013-10-21 16:45:43 +02:00
data.hpp Merge branch 'dialogue' into saving 2013-10-21 16:45:43 +02:00
idcollection.hpp handle deleted dialogue records 2013-10-21 15:38:13 +02:00
idtable.cpp moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase 2013-09-27 15:04:09 +02:00
idtable.hpp
idtableproxymodel.cpp
idtableproxymodel.hpp
record.cpp
record.hpp
ref.cpp fixed reference loading code (editor) 2013-08-29 13:27:54 +02:00
ref.hpp
refcollection.cpp Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
refcollection.hpp Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
refidadapter.cpp
refidadapter.hpp
refidadapterimp.cpp
refidadapterimp.hpp
refidcollection.cpp added saving for referenceable records 2013-09-24 13:53:19 +02:00
refidcollection.hpp added saving for referenceable records 2013-09-24 13:53:19 +02:00
refiddata.cpp added saving for referenceable records 2013-09-24 13:53:19 +02:00
refiddata.hpp added saving for referenceable records 2013-09-24 13:53:19 +02:00
regionmap.cpp
regionmap.hpp
scriptcontext.cpp separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
scriptcontext.hpp separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
universalid.cpp added topic and journal tables 2013-10-20 17:15:32 +02:00
universalid.hpp added topic and journal tables 2013-10-20 17:15:32 +02:00