scrawl f2c3616638 Merge branch 'next' into terrain_next ...

Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake

2012-02-28 21:49:45 +01:00

..

bsa

BSAArchive done and some change to NIFLoader

2011-11-23 02:17:21 -05:00

cfg

Issue #168: Configuration cleanup, part 2

2011-09-06 17:59:40 +02:00

compiler

redirecting output of expression evalutation to new report channel

2011-04-26 22:07:27 +02:00

esm

Added blended textures to the terrain

2012-01-21 17:59:12 +00:00

esm_store

Merge branch 'next' into terrain_next

2012-02-28 21:49:45 +01:00

file_finder

more cleanup

2011-06-15 22:33:31 +02:00

files

Applying Gus's Windows fix2

2011-10-18 21:04:31 -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

Clean up compilation warnings.

2012-02-12 15:45:08 +01:00

nifbullet

Fixe collision shape bug.

2011-10-29 13:35:43 +02:00

nifogre

Merging in master

2012-02-19 15:39:12 -05: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

Fixed some issues with the CMake files

2012-01-28 01:36:17 +01:00

doc.hpp

second set of additional doxygen comments

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