OpenMW/world at 5eefcd862f55d90e22322d729c1bf2513d15ebe5 - OpenMW - Gitea: Git with a cup of tea

mirror/OpenMW

mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 21:40:03 +00:00

History

cc9cii 5eefcd862f Merge branch 'master' into NonTableFields

Conflicts:
	apps/opencs/model/tools/tools.cpp
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/idtable.hpp
	apps/opencs/model/world/refidadapter.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/view/world/dialoguesubview.hpp

2015-03-16 10:30:54 +11: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

Reduce difference with the master branch where possible.

2015-03-06 19:20:50 +11:00

collectionbase.cpp

fix -Wnewline-eof warnings

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

collectionbase.hpp

fix -Wnewline-eof warnings

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

columnbase.cpp

fix -Wnewline-eof warnings

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

columnbase.hpp

Fix typo to get table display working.

2015-03-07 11:42:50 +11:00

columnimp.hpp

Reduce difference with the master branch where possible.

2015-03-06 19:20:50 +11:00

columns.cpp

Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields

2015-03-04 11:22:42 +11:00

columns.hpp

Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields

2015-03-04 11:22:42 +11:00

commanddispatcher.cpp

fix -Wnewline-eof warnings

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

commanddispatcher.hpp

added extended versions of revert and delete

2014-06-11 11:43:38 +02:00

commands.cpp

fix -Wnewline-eof warnings

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

commands.hpp

Merge branch 'master' into NonTableFields

2015-03-16 10:30:54 +11:00

data.cpp

Fix saving land data.

2015-03-13 22:06:55 +11:00

data.hpp

load start up script records

2015-03-03 14:31:59 +01:00

idcollection.hpp

load land for non-base content files immediately

2014-11-30 14:33:39 +01:00

idtable.cpp

Resolved compile issues, but not fully working.

2015-03-06 14:36:13 +11:00

idtable.hpp

Merge branch 'master' into NonTableFields

2015-03-16 10:30:54 +11:00

idtablebase.cpp

fix -Wnewline-eof warnings

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

idtablebase.hpp

added Feature_Constant to IdTable

2014-07-05 12:44:11 +02:00

idtableproxymodel.cpp

Use default sort until a more generic sort that uses numeric order can be implemented.

2014-10-08 07:59:21 +11:00

idtableproxymodel.hpp

Sort cell id column by numerical order.

2014-10-07 20:11:44 +11:00

info.hpp

subclass ESM::DialInfo to keep track of parent topic

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

infocollection.cpp

More warning fixes.

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

infocollection.hpp

More warning fixes.

2015-03-14 08:09:19 +11: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

nestedadaptors.cpp

major refactorisation

2014-07-22 10:27:45 +02:00

nestedadaptors.hpp

saving progress

2014-07-30 17:07:11 +02:00

nestedtablemodel.cpp

undo works now

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

nestedtablemodel.hpp

undo works now

2014-07-20 22:39:39 +02: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

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

fix -Wnewline-eof warnings

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

ref.hpp

More warning fixes.

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

refcollection.cpp

abstracted message collection into a class

2014-12-07 18:57:47 +01:00

refcollection.hpp

Fix more warnings.

2015-03-14 06:36:35 +11:00

refidadapter.cpp

fix -Wnewline-eof warnings

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

refidadapter.hpp

Merge branch 'master' into NonTableFields

2015-03-16 10:30:54 +11:00

refidadapterimp.cpp

Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields

2015-03-04 11:22:42 +11:00

refidadapterimp.hpp

Merge branch 'master' into NonTableFields

2015-03-16 10:30:54 +11:00

refidcollection.cpp

Merge branch 'master' into NonTableFields

2015-03-16 10:30:54 +11:00

refidcollection.hpp

inserted additional class for nested collections

2014-07-30 22:08:55 +02:00

refiddata.cpp

fixed referenceable-loading in case of more than one content file

2014-02-15 15:50:17 +01:00

refiddata.hpp

Added code to delete nestedRows

2014-06-24 12:21:40 +02:00

regionmap.cpp

fix -Wnewline-eof warnings

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

fix -Wnewline-eof warnings

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

resourcetable.hpp

added resources tables

2014-07-05 15:50:47 +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

Redefinition of default template argument

2015-02-09 17:25:55 +01:00

tablemimedata.cpp

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

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

load start up script records

2015-03-03 14:31:59 +01:00

universalid.hpp

load start up script records

2015-03-03 14:31:59 +01:00