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

..

blacklist.cpp

fix -Wnewline-eof warnings

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

blacklist.hpp

consider script blacklist in OpenCS verifier

2014-07-21 12:15:21 +02:00

document.cpp

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

2015-03-27 17:30:48 +01:00

document.hpp

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

2015-03-27 17:30:48 +01:00

documentmanager.cpp

OpenCS: preliminary port of PreviewWidget to OSG

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

documentmanager.hpp

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

2015-03-27 17:30:48 +01:00

loader.cpp

abstracted message collection into a class

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

loader.hpp

display record count in loading window

2014-06-26 11:41:21 +02:00

messages.cpp

fix -Wnewline-eof warnings

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

messages.hpp

abstracted message collection into a class

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

operation.cpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

operation.hpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

operationholder.cpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

operationholder.hpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

runner.cpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

runner.hpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

saving.cpp

Add saving land and land textures. Should resolve Bug #2447.

2015-03-13 08:01:48 +11:00

saving.hpp

text encoding configuration (was using hardcoded settings before)

2014-05-12 10:32:57 +02:00

savingstages.cpp

More warning fixes.

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

savingstages.hpp

More warning fixes.

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

savingstate.cpp

Merge branch 'refs'

2014-05-30 10:38:38 +02:00

savingstate.hpp

Merge branch 'refs'

2014-05-30 10:38:38 +02:00

stage.cpp

fix -Wnewline-eof warnings

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

stage.hpp

abstracted message collection into a class

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

state.hpp

track state of OpenMW process and enable/disable run/stop actions accordingly

2014-09-02 11:56:35 +02:00