mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-02-10 03:09:05 +00:00
Code Issues Releases Wiki Activity
openmw/apps/opencs/model/world
History
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
..
cell.cpp
cell.hpp
collection.hpp flag reordered records as modified 2013-11-14 12:21:10 +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 added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
columnbase.cpp
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 minor cleanup 2014-01-14 12:46:53 +04:00
columns.hpp Merge branch 'master' into dialogue 2013-11-10 13:21:39 +01:00
commands.cpp added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
commands.hpp added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
data.cpp hid ID column in info tables (not relevant for the user) 2013-11-14 13:14:37 +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 added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
idtable.hpp added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
idtableproxymodel.cpp
idtableproxymodel.hpp
info.hpp subclass ESM::DialInfo to keep track of parent topic 2013-11-01 17:43:45 +01:00
infocollection.cpp minor cleanup 2014-01-14 12:46:53 +04:00
infocollection.hpp added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
record.cpp
record.hpp
ref.cpp removed redundant deletion flag from CellRef 2014-01-06 13:53:20 +01:00
ref.hpp added missing columns to topic info table 2013-11-05 11:41:48 +01:00
refcollection.cpp removed redundant deletion flag from CellRef 2014-01-06 13:53:20 +01: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
refidadapter.hpp
refidadapterimp.cpp
refidadapterimp.hpp
refidcollection.cpp Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
refidcollection.hpp correcting 2013-12-30 18:41:16 +01:00
refiddata.cpp Finishing stuff. 2014-01-03 11:31:54 +01:00
refiddata.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 18:28:35 +01:00
regionmap.cpp
regionmap.hpp
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