Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ...

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.

2013-01-25 18:22:01 +01:00

..

bsa

Improve filename pattern matching

2013-01-15 14:10:52 -08:00

compiler

more string lowercase

2013-01-09 20:51:52 +01:00

esm

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

file_finder

Issue #133 Handle resources across multiple data directories

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

files

Mix debug and release if necessary under non Windows systems.

2013-01-11 09:10:48 +01:00

interpreter

replaced std::string concatenation with std::ostringstream

2013-01-01 11:59:05 -08:00

misc

added missing reference to <cctype>

2013-01-01 10:58:30 -08:00

nif

Use the record index for finding the NiTriShape instead of the name

2013-01-13 08:00:04 -08:00

nifbullet

cache loaded NIF files to eliminate reloads

2013-01-10 21:47:02 -08:00

nifogre

Use the record index for finding the NiTriShape instead of the name

2013-01-13 08:00:04 -08:00

nifoverrides

more string lowercase

2013-01-09 20:51:52 +01: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

to_utf8 test: fix Utf8Encoder constructor

2013-01-06 11:39:18 +01:00

translation

Merge remote-tracking branch 'corristo/master'

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

CMakeLists.txt

increased performance of ConstrainedDataStream

2013-01-04 13:40:00 -08:00

doc.hpp

second set of additional doxygen comments

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