OpenMW

mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00

History

scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp

2015-05-04 02:41:50 +02: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

Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate

2015-04-18 09:37:19 +10:00

columnbase.hpp

Resolve merge issues and fix typos.

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

columnimp.hpp

Merge branch 'master' into moveref

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

columns.cpp

Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.

2015-05-01 12:14:09 +10:00

columns.hpp

Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.

2015-05-01 12:14:09 +10:00

commanddispatcher.cpp

Merge remote-tracking branch 'cc9cii/moveref'

2015-04-28 14:07:18 +02:00

commanddispatcher.hpp

create modify commands through command dispatcher

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

commands.cpp

Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.

2015-05-01 12:14:09 +10:00

commands.hpp

Merge remote-tracking branch 'cc9cii/moveref'

2015-04-28 14:07:18 +02:00

data.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-04 02:41:50 +02:00

data.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-04 02:41:50 +02:00

idcollection.hpp

Fixed initial loading of moved refs.

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

idtable.cpp

Merge remote-tracking branch 'cc9cii/moveref'

2015-04-28 14:07:18 +02: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

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

idtree.cpp

Alternative way of finding UniversalId without bloating IdTree.

2015-04-25 15:26:32 +10:00

idtree.hpp

Alternative way of finding UniversalId without bloating IdTree.

2015-04-25 15:26:32 +10: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

nestedcoladapterimp.cpp

TopicInfos result script are now displayed in dialogue subviews.

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

nestedcoladapterimp.hpp

TopicInfos result script are now displayed in dialogue subviews.

2015-04-19 13:31:16 +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

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

2015-04-17 01:27:36 +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

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

Add clothing/armor part reference table to dialogue subview.

2015-04-13 21:08:23 +10:00

refidadapterimp.hpp

Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.

2015-05-01 12:14:09 +10:00

refidcollection.cpp

Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.

2015-05-01 12:14:09 +10:00

refidcollection.hpp

Remove duplicated checks and exceptions.

2015-04-13 08:03:30 +10:00

refiddata.cpp

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

2014-02-15 15:50:17 +01: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

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

OpenCS: preliminary port of cell rendering to OSG

2015-03-25 23:35:10 +01:00

resources.hpp

OpenCS: use the new VFS, restored resource tables

2015-03-20 16:22:33 +01:00

resourcesmanager.cpp

OpenCS: preliminary port of cell rendering to OSG

2015-03-25 23:35:10 +01:00

resourcesmanager.hpp

OpenCS: preliminary port of cell rendering to OSG

2015-03-25 23:35:10 +01: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

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

Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516 )

2015-05-03 16:35:10 +02:00

universalid.hpp

extend global search to all record and reference tables

2015-03-28 14:36:28 +01:00