Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue ...

Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp

2012-11-10 15:44:44 +01:00

..

bsa

consider all files in Splash directory

2012-10-17 12:39:45 +02:00

compiler

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +02:00

esm

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

file_finder

Issue #133 Handle resources across multiple data directories

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

files

Fixed an issue with some paths not concatenating properly.

2012-09-09 16:28:02 +02:00

interpreter

Issue #181: assignment to member variables

2012-06-16 14:29:55 +02:00

misc

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

nif

compatibility fix

2012-08-05 00:06:19 +02:00

nifbullet

fix BulletShapeLoader namespace

2012-11-08 18:48:07 +01:00

nifogre

Use a multimap to store the text keys

2012-09-28 23:20:15 -07:00

nifoverrides

override nif transparency settings (part 1)

2012-04-11 20:13:15 +02:00

settings

settings.cpp: fix std::runtime_error compile error

2012-09-05 23:39:58 +02:00

terrain

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

to_utf8

rename getASCII() to getLegacyEnc()

2012-09-23 22:20:18 +04:00

CMakeLists.txt

move ESMStore to MWWorld

2012-11-05 17:18:01 +04:00

doc.hpp

second set of additional doxygen comments

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