Nikolay Kasyanov 523648dbb1 Merge branch 'master' into pgrd-rendering ...

Conflicts:
	apps/openmw/mwrender/debugging.cpp

2012-03-31 14:56:18 +04:00

..

bsa

Merge branch 'master' into pgrd-rendering

2012-03-31 14:56:18 +04:00

compiler

fixed problem with parsing optional string arguments

2012-03-18 14:27:49 +01:00

esm

Merge remote branch 'scrawl/terrain18' into terrain

2012-03-30 15:38:14 +02:00

esm_store

Merge branch 'master' into pgrd-rendering

2012-03-31 13:42:13 +04:00

file_finder

Issue #133 Handle resources across multiple data directories

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

files

Merge branch 'master' into pgrd-rendering

2012-03-31 14:56:18 +04:00

interpreter

don't create a new virtual machine for each script and frame

2011-05-18 16:01:19 +02:00

misc

fixes #128 Configuration cleanup.

2011-08-19 21:06:09 +02:00

nif

Fix tabulation/formatting

2012-03-23 22:15:45 +02:00

nifbullet

Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.

2012-03-26 19:09:55 +02:00

nifogre

Merge branch 'master' into pgrd-rendering

2012-03-31 14:56:18 +04:00

terrain

Remove no longer needed local .gitignore

2011-03-07 19:13:24 +01:00

to_utf8

Added new command line option: "encoding"

2011-07-17 22:16:50 +02:00

CMakeLists.txt

Added new FileLibrary class to handle music, this fixes a number of issues.

2012-03-07 17:46:51 +02:00

doc.hpp

second set of additional doxygen comments

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