scrawl 6c1ff8caca Merge branch 'master' into next ...

Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp

2013-03-20 02:29:03 +01:00

..

bsa

Revive bsatool

2013-03-07 21:13:10 +01:00

compiler

workaround for faulty endif in Morrowind scripts

2013-03-18 12:05:54 +01:00

esm

Better use an enum for magic effect IDs

2013-03-16 23:28:26 +01:00

file_finder

Issue #133 Handle resources across multiple data directories

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

fileorderlist

Merge branch 'master' into next

2013-03-20 02:29:03 +01:00

files

Load fallback archives listed in openmw.cfg at startup

2013-03-09 21:14:11 +01:00

interpreter

fixed a spelling mistake

2013-03-09 15:39:49 +01:00

misc

added missing reference to <cctype>

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

nif

renamed low-level NIF related files and include guards to conform to naming convention

2013-03-02 10:46:12 -08:00

nifbullet

Markers should still have collision if they have a NiRootCollisionNode

2013-03-14 19:03:42 +01:00

nifogre

Merge branch 'master' into next

2013-03-20 02:29:03 +01:00

nifoverrides

renamed high level NIF files...

2013-03-02 13:23:09 -08: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

fixed various warnings about converting size_t to int

2013-02-23 10:23:38 -08:00

translation

Merge remote-tracking branch 'corristo/master'

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

CMakeLists.txt

moved header record struct to separate file

2013-03-12 09:16:03 +01:00

doc.hpp

second set of additional doxygen comments

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