cc9cii 2612a91f8d Merge branch 'master' into autocalc ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.hpp
	apps/opencs/view/world/dialoguesubview.cpp

2015-06-27 07:46:36 +10:00

..

cell.cpp

implemented reference record merging

2014-05-20 09:02:22 +02:00

cell.hpp

fix -Wnewline-eof warnings

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

cellcoordinates.cpp

added CellCoordinates and CellSelection classes

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

cellcoordinates.hpp

added CellCoordinates and CellSelection classes

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

cellselection.cpp

added CellCoordinates and CellSelection classes

2014-04-07 13:44:43 +02: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

fix -Wnewline-eof warnings

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

collectionbase.hpp

Spelling and other consistencies nit pick.

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

columnbase.cpp

size limits for meta data strings

2015-06-26 18:19:00 +02:00

columnbase.hpp

size limits for meta data strings

2015-06-26 18:19:00 +02:00

columnimp.hpp

size limits for meta data strings

2015-06-26 18:19:00 +02:00

columns.cpp

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10:00

columns.hpp

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10:00

commanddispatcher.cpp

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

commanddispatcher.hpp

create modify commands through command dispatcher

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

commands.cpp

Merge remote-tracking branch 'smbas/master'

2015-05-23 16:02:09 +02:00

commands.hpp

Add record state tracking to the ModifyCommand (Fix #2555)

2015-05-22 23:53:25 +03:00

data.cpp

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10:00

data.hpp

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10: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

CommandDelegate: extract a display type from a model if it isn't specified

2015-06-03 00:00:39 +03: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

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04: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

Add support to build with Qt5 (Task #2665)

2015-06-12 15:13:42 +02:00

idtableproxymodel.hpp

Fix missing columns in tables. Should resolve Bug #2624.

2015-06-08 08:04:18 +10:00

idtree.cpp

Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS.

2015-06-24 21:05:59 +10:00

idtree.hpp

Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS.

2015-06-24 21:05:59 +10:00

info.hpp

subclass ESM::DialInfo to keep track of parent topic

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

infocollection.cpp

Rows with the same topic but in different letter case can be reordered

2015-06-24 20:01:29 +03:00

infocollection.hpp

More warning fixes.

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

infotableproxymodel.cpp

killed some tabs

2015-06-26 18:54:49 +02:00

infotableproxymodel.hpp

Refine InfoTableProxyModel::getFirstInfoRow() code

2015-06-25 20:08:42 +03: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

Implement terrain rendering in OpenCS (Fixes #1597)

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

landtexture.hpp

Implement terrain rendering in OpenCS (Fixes #1597)

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

metadata.cpp

moved meta data into a new single-row table

2015-06-26 13:01:25 +02: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

Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.

2015-04-09 19:11:19 +10:00

nestedcollection.hpp

Fix for more gcc differences.

2015-04-09 20:53:41 +10:00

nestedcolumnadapter.hpp

More warning fixes.

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

nestedidcollection.hpp

More warning fixes.

2015-04-19 09:42:44 +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

Fix for NestedTableProxyModel::forwardDataChanged()

2015-06-24 15:07:09 +03: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

fix -Wnewline-eof warnings

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

record.hpp

removed redundant functions

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

ref.cpp

Resolve merge issues and fix typos.

2015-04-25 09:39:37 +10:00

ref.hpp

Merge branch 'master' into moveref

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

refcollection.cpp

Fix loading moved references.

2015-04-28 08:07:01 +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 undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable.

2015-06-26 16:10:50 +10:00

refidadapterimp.hpp

Fix undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable.

2015-06-26 16:10:50 +10:00

refidcollection.cpp

Fix undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable.

2015-06-26 16:10:50 +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

Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545)

2015-05-22 00:57:47 +03: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

RegionMap uses proper colors

2015-06-12 22:31:12 +03: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

fix -Wnewline-eof warnings

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

resources.hpp

enable dragging from resources tables

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

resourcesmanager.cpp

fix -Wnewline-eof warnings

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

resourcesmanager.hpp

fix -Wnewline-eof warnings

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

resourcetable.cpp

sorting out some Display enum mixup

2015-04-04 19:55:53 +02: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

fix -Wnewline-eof warnings

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

scope.hpp

generalised the concept of record scope

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

scriptcontext.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04: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

Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable.

2014-09-08 23:14:04 +10:00

universalid.cpp

added missing MetaData table UniversalId type

2015-06-26 15:17:18 +02:00

universalid.hpp

added missing MetaData table UniversalId type

2015-06-26 15:17:18 +02:00

usertype.hpp

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

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