Marc Zinnschlag c626e2b257 Merge branch 'ref' ...

Conflicts:
	apps/opencs/view/doc/view.hpp

2013-05-19 14:59:01 +02:00

..

bsa

Fix broken loose file resources when using Ogre 1.9

2013-04-29 12:32:24 +02:00

compiler

Issue #694: allow float literals starting with .

2013-05-13 11:38:35 +02:00

esm

Merge branch 'ref'

2013-05-19 14:59:01 +02: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

Dialogue history rewrite WIP

2013-05-04 14:15:47 +02:00

misc

Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries

2013-05-01 10:28:59 +02:00

nif

Revert "reworked Nif::KeyListT into Nif::CurveT"

2013-04-30 14:53:51 +02:00

nifbullet

Avoid colliding with AvoidNodes

2013-04-28 11:12:55 -07:00

nifogre

Build a skeleton for Nifs that have a matching .kf file

2013-05-08 01:03:57 -07: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

Merge branch 'script'

2013-04-11 10:50:46 +02:00

doc.hpp

second set of additional doxygen comments

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