scrawl 62774fcc4a Merge branch 'master' into HEAD ...

Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp

2014-01-06 00:23:17 +01:00

..

bsa

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

compiler

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

contentselector

Fixed the content selector checkboxes appearing as partially checked

2013-11-30 12:16:57 +01:00

esm

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

file_finder

Issue #133 Handle resources across multiple data directories

2012-02-12 14:21:07 +01:00

files

Quick build fix for windows

2013-12-28 18:16:01 +01:00

interpreter

Added asserts in Interpreter::installSegmentX methods.

2013-12-30 23:51:44 +01:00

loadinglistener

Refactored loading screen

2013-08-27 15:48:13 +02:00

misc

Fix warning about uninitialized variable inside stream.peak():

2013-12-28 13:55:54 +01:00

nif

Not handling interpolation type should be an error, since it will fail reading the next record if it hasn't read the previous one completely.

2013-12-31 00:56:04 +01:00

nifbullet

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

nifogre

Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes

2014-01-05 18:09:50 +01:00

nifoverrides

Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes

2014-01-05 18:09:50 +01:00

ogreinit

Fix incorrect log file name for launcherOgre.log

2013-12-03 15:56:00 +01:00

settings

Get rid of underscore defines. They are reserved by the standard.

2014-01-05 18:22:29 +01:00

terrain

Fixed valgrind warning about uninitialized variable:

2013-12-29 21:58:55 +01:00

to_utf8

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

translation

Merge remote-tracking branch 'corristo/master'

2013-01-06 18:40:30 +01:00

CMakeLists.txt

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

doc.hpp

second set of additional doxygen comments

2010-09-25 20:15:05 +02:00