1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-13 06:37:57 +00:00
OpenMW/apps/opencs/model/world
scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
..
cell.cpp
cell.hpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
cellcoordinates.cpp
cellcoordinates.hpp
cellselection.cpp
cellselection.hpp
collection.hpp
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
columnimp.hpp Revert "Revert "Light charge handling fix"" 2015-01-23 15:33:39 +01:00
columns.cpp
columns.hpp
commanddispatcher.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
commanddispatcher.hpp
commands.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
commands.hpp Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
data.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
data.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
idcollection.hpp
idtable.cpp
idtable.hpp Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
idtablebase.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
idtablebase.hpp
idtableproxymodel.cpp
idtableproxymodel.hpp
info.hpp
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
land.hpp
landtexture.cpp
landtexture.hpp
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 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
refidadapterimp.cpp remove redundant initialization statement 2015-01-02 02:23:10 +01:00
refidadapterimp.hpp For RefId's, modify a copy of the base record rather than modifying the record directly. 2015-03-10 06:51:54 +11:00
refidcollection.cpp Revert to the original clone() method. Create a new copy method for modified records. 2015-03-10 09:45:35 +11:00
refidcollection.hpp
refiddata.cpp
refiddata.hpp
regionmap.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
regionmap.hpp
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 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
resourcetable.hpp
scope.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scope.hpp
scriptcontext.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scriptcontext.hpp
subcellcollection.hpp Redefinition of default template argument 2015-02-09 17:25:55 +01:00
tablemimedata.cpp
tablemimedata.hpp
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