Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.		2012-11-25 14:12: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 remote-tracking branch 'upstream/master' into multiple_esm_esp	2012-11-25 14:12:44 +01:00
esm_store	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2012-11-25 14:12: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	fixed getString function in NIF loader	2012-11-22 10:35:03 +01: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