Chris Robinson 4e1e0eaf62 Merge remote-tracking branch 'zini/master' into material-fix ...

Conflicts:
	components/nifogre/ogrenifloader.cpp

2013-03-03 14:24:05 -08:00

..

bsa

Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics

2013-02-23 04:13:51 +01:00

compiler

workaround for garbage after an end statement

2013-02-25 10:32:38 +01:00

esm

minor cleanup

2013-02-28 22:17:07 +01:00

file_finder

Issue #133 Handle resources across multiple data directories

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

fileorderlist

Move OpenDialog to editor and use it in startup dialogue.

2013-02-05 22:06:36 +01:00

files

Removing all traces of "Open Morrowind".

2013-02-28 19:36:10 +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

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

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

nifbullet

renamed high level NIF files...

2013-03-02 13:23:09 -08:00

nifogre

Merge remote-tracking branch 'zini/master' into material-fix

2013-03-03 14:24:05 -08: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

renamed high level NIF files...

2013-03-02 13:23:09 -08:00

doc.hpp

second set of additional doxygen comments

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