Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ...

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp

2013-11-10 13:21:39 +01:00

..

cell.cpp

fixed reference loading code (editor)

2013-08-29 13:27:54 +02:00

cell.hpp

Promoted references to a top level record internally.

2013-06-08 12:45:13 +02:00

collection.hpp

fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection

2013-11-10 13:00:46 +01:00

collectionbase.cpp

moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase

2013-09-27 15:04:09 +02:00

collectionbase.hpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

columnbase.cpp

columns are now identified via an enum instead the name string

2013-08-07 09:36:05 +02:00

columnbase.hpp

added missing columns to topic info table

2013-11-05 11:41:48 +01:00

columnimp.hpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

columns.cpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

columns.hpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

commands.cpp

avoid use of column number literals

2013-08-26 12:25:52 +02:00

commands.hpp

added specialised Creator for references

2013-07-30 12:53:03 +02:00

data.cpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

data.hpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

idcollection.hpp

Fixed merge conflicts with saving branch

2013-10-25 19:23:03 -05:00

idtable.cpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

idtable.hpp

avoid the use of hardcoded column numbers

2013-08-08 12:49:30 +02:00

idtableproxymodel.cpp

simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)

2013-08-22 09:17:57 +02:00

idtableproxymodel.hpp

simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)

2013-08-22 09:17:57 +02:00

info.hpp

subclass ESM::DialInfo to keep track of parent topic

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

infocollection.cpp

fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection

2013-11-10 13:00:46 +01:00

infocollection.hpp

fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection

2013-11-10 13:00:46 +01:00

record.cpp

Fixed build errors in OpenCS

2013-02-12 13:57:16 +01:00

record.hpp

added model column

2013-05-11 18:35:48 +02:00

ref.cpp

added missing columns to topic info table

2013-11-05 11:41:48 +01:00

ref.hpp

added missing columns to topic info table

2013-11-05 11:41:48 +01:00

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

added data structures for referenceable records

2013-05-06 14:11:55 +02:00

refidadapter.hpp

small test with statics and two columns

2013-05-11 17:01:16 +02:00

refidadapterimp.cpp

added missing columns for weapon records

2013-05-19 14:44:41 +02:00

refidadapterimp.hpp

added missing columns for weapon records

2013-05-19 14:44:41 +02:00

refidcollection.cpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

refidcollection.hpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01: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

inverted region map y-axis

2013-07-13 16:34:10 +02:00

regionmap.hpp

added region map tooltips

2013-07-12 12:55:14 +02:00

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

first attempt at an info record collection

2013-10-29 13:18:22 +01:00

universalid.hpp

first attempt at an info record collection

2013-10-29 13:18:22 +01:00