Marc Zinnschlag 55dfe48ef7 copy meta data from game file when merging ...

(cherry picked from commit 47dd9505a9464dc5c947f409c3c4a80cf4d8e395)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp

2015-11-01 13:34:41 +11:00

..

cell.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

cell.hpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

cellcoordinates.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

cellcoordinates.hpp

added CellCoordinates and CellSelection classes

2014-04-07 13:44:43 +02:00

cellselection.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

cellselection.hpp

added CellCoordinates and CellSelection classes

2014-04-07 13:44:43 +02:00

collection.hpp

Changes as per feedback comments.

2015-04-11 11:26:29 +10:00

collectionbase.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

collectionbase.hpp

Spelling and other consistencies nit pick.

2015-03-30 11:53:33 +11:00

columnbase.cpp

#2730 and #2725

2015-09-08 06:29:25 +10:00

columnbase.hpp

#2730 and #2725

2015-09-08 06:29:25 +10:00

columnimp.cpp

Show race only when mesh type is Skin (in BodyParts table)

2015-09-08 06:47:34 +10:00

columnimp.hpp

Add missing includes to columnimp.hpp

2015-09-08 06:48:04 +10:00

columns.cpp

Remove enum names for AiWanderRepeat column

2015-09-08 06:46:10 +10:00

columns.hpp

Editor: remove creature flag of unknown purpose from the UI

2015-09-08 06:35:58 +10:00

commanddispatcher.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

commanddispatcher.hpp

create modify commands through command dispatcher

2015-01-15 14:24:33 +01:00

commands.cpp

ModifyCommand uses a proper name of a modified nested value

2015-09-08 06:45:58 +10:00

commands.hpp

Restore Modified status of a record when adding/removing nested rows

2015-09-08 05:45:17 +10:00

data.cpp

copy meta data from game file when merging

2015-11-01 13:34:41 +11:00

data.hpp

copy meta data from game file when merging

2015-11-01 13:34:41 +11:00

idcollection.hpp

Fixed initial loading of moved refs.

2015-04-26 11:35:46 +10:00

idcompletionmanager.cpp

Add Topic/Journal Id completion to InfoCreator

2015-06-19 12:51:50 +03:00

idcompletionmanager.hpp

IdCompletionManager uses Display type instread of ColumnId for creating completers

2015-06-03 12:01:13 +03:00

idtable.cpp

Inform about State change (not a whole row) when modifying a table value

2015-09-08 06:47:50 +10:00

idtable.hpp

Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.

2015-04-25 06:06:11 +10:00

idtablebase.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

idtablebase.hpp

moved getColumnId function from IdTable to IdTable base and made it virtual

2015-03-29 15:28:11 +02:00

idtableproxymodel.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

idtableproxymodel.hpp

Create a custom signal to inform about a row addition in IdTableProxyModel

2015-07-30 08:14:20 +10:00

idtree.cpp

Inform about State change (not a whole row) when modifying a table value

2015-09-08 06:47:50 +10:00

idtree.hpp

Add the ability to search a nested column index

2015-07-27 13:10:52 +10:00

info.hpp

subclass ESM::DialInfo to keep track of parent topic

2013-11-01 17:43:45 +01:00

infocollection.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

infocollection.hpp

More warning fixes.

2015-03-14 08:09:19 +11:00

infotableproxymodel.cpp

Don't inform about a nested row addition in proxy models for top-level tables

2015-07-30 09:14:03 +10:00

infotableproxymodel.hpp

Inform about a row addition after re-sorting in InfoTableProxyModel

2015-07-30 08:14:36 +10:00

land.cpp

Implement terrain rendering in OpenCS (Fixes #1597)

2014-10-08 17:17:31 +02:00

land.hpp

Implement terrain rendering in OpenCS (Fixes #1597)

2014-10-08 17:17:31 +02:00

landtexture.cpp

Fix the ESM::LandTexture NAME being discarded on loading

2015-09-08 06:42:45 +10:00

landtexture.hpp

Fix the ESM::LandTexture NAME being discarded on loading

2015-09-08 06:42:45 +10:00

metadata.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

metadata.hpp

moved meta data into a new single-row table

2015-06-26 13:01:25 +02:00

nestedcoladapterimp.cpp

Mimic vanilla CS behaviour with NPC stats auto calculations. Should resolve Bug #2663.

2015-06-18 22:02:08 +10:00

nestedcoladapterimp.hpp

Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551.

2015-05-19 22:01:40 +10:00

nestedcollection.cpp

Add the ability to search a nested column index

2015-07-27 13:10:52 +10:00

nestedcollection.hpp

Add the ability to search a nested column index

2015-07-27 13:10:52 +10:00

nestedcolumnadapter.hpp

More warning fixes.

2015-04-19 09:42:44 +10:00

nestedidcollection.hpp

Count of nested columns can be retrieved for a collection with no records

2015-07-27 14:25:02 +10:00

nestedinfocollection.cpp

TopicInfos result script are now displayed in dialogue subviews.

2015-04-19 13:31:16 +10:00

nestedinfocollection.hpp

TopicInfos result script are now displayed in dialogue subviews.

2015-04-19 13:31:16 +10:00

nestedtableproxymodel.cpp

Proper index creation for nested data

2015-07-27 15:24:01 +10:00

nestedtableproxymodel.hpp

Changes to support dialogue only items but in a list view via QDataWidgetMapper.

2015-04-17 01:27:36 +10:00

nestedtablewrapper.cpp

undo works now

2014-07-20 22:39:39 +02:00

nestedtablewrapper.hpp

undo works now

2014-07-20 22:39:39 +02:00

npcstats.cpp

Address review comments.

2015-06-26 07:48:48 +10:00

npcstats.hpp

Address review comments.

2015-06-26 07:48:48 +10:00

pathgrid.cpp

Some more forward-declaring for OpenMW-CS

2015-02-09 16:50:34 +01:00

pathgrid.hpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

record.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

record.hpp

removed redundant functions

2015-03-12 10:51:50 +01:00

ref.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

ref.hpp

Merge branch 'master' into moveref

2015-04-25 06:52:53 +10:00

refcollection.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

refcollection.hpp

Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.

2015-04-26 14:55:40 +10:00

refidadapter.cpp

Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...

2015-04-13 06:39:38 +10:00

refidadapter.hpp

Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...

2015-04-13 06:39:38 +10:00

refidadapterimp.cpp

Fix for issue #6 (https://github.com/cc9cii/openmw/issues/6) where dialogue subview for editing an NPC fails with an "invalid ID" exception.

2015-07-31 09:05:26 +10:00

refidadapterimp.hpp

Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()

2015-09-08 06:46:32 +10:00

refidcollection.cpp

Editor: fix a typo in ESM::Light flag mappings

2015-09-08 06:37:31 +10:00

refidcollection.hpp

Mimic vanilla CS behaviour with NPC stats auto calculations. Should resolve Bug #2663.

2015-06-18 22:02:08 +10:00

refiddata.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

refiddata.hpp

Off by one error - can't delete the last element of a refid collection.

2015-04-25 06:04:39 +10:00

regionmap.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

regionmap.hpp

always use the cell ID instead of the exterior coordinate fields from the original cell struct

2014-04-13 14:16:59 +02:00

resources.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

resources.hpp

enable dragging from resources tables

2014-07-07 15:20:05 +02:00

resourcesmanager.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

resourcesmanager.hpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

resourcetable.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

resourcetable.hpp

moved getColumnId function from IdTable to IdTable base and made it virtual

2015-03-29 15:28:11 +02:00

scope.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

scope.hpp

generalised the concept of record scope

2014-08-06 09:53:10 +02:00

scriptcontext.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

scriptcontext.hpp

added script verifier

2014-02-14 13:38:30 +01:00

subcellcollection.hpp

Code reorganisation to prepare for nested sound table in regions.

2015-04-11 13:54:05 +10:00

tablemimedata.cpp

Add missing mappings to TableMimeData

2015-06-20 21:00:15 +03:00

tablemimedata.hpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

universalid.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

universalid.hpp

Initial support for Land and LandTexture tables. Updates Features #936 and #933.

2015-08-01 07:50:56 +10:00

usertype.hpp

Add missing files for autocalc. Remove c++11 dependency.

2015-06-24 21:58:28 +10:00