Nikolay Kasyanov 58add97676 Merge branch 'master' into osx-ogre-19 ...

Conflicts:
	CMakeLists.txt

2014-02-13 20:34:06 +04:00

..

bsa

Some unneeded includes cleanup

2014-01-15 14:53:28 +01:00

compiler

Fix typo

2014-02-10 22:53:16 +01:00

contentselector

Fixed the content selector checkboxes appearing as partially checked

2013-11-30 12:16:57 +01:00

esm

Feature #764: Store the actor that gave the dialog response

2014-02-01 18:42:01 +01:00

file_finder

Issue #133 Handle resources across multiple data directories

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

files

Quick build fix for windows

2013-12-28 18:16:01 +01:00

interpreter

Fix message box formatting bug

2014-02-05 05:18:11 +01:00

loadinglistener

Refactored loading screen

2013-08-27 15:48:13 +02:00

misc

Fix warning about uninitialized variable inside stream.peak():

2013-12-28 13:55:54 +01:00

nif

Skip inactive controllers. Fixes those bloody bone boots again.

2014-01-31 05:59:58 +01:00

nifbullet

Bug #1107: Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.

2014-01-15 14:53:29 +01:00

nifogre

Fast-forward particle systems to make cell loads less obvious.

2014-02-05 05:18:09 +01:00

nifoverrides

Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes

2014-01-05 18:09:50 +01:00

ogreinit

Merge branch 'master' into osx-ogre-19

2014-02-13 20:34:06 +04:00

settings

Get rid of underscore defines. They are reserved by the standard.

2014-01-05 18:22:29 +01:00

terrain

Fix some hardcoded literals

2014-02-13 11:15:55 +01:00

to_utf8

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

translation

Merge remote-tracking branch 'corristo/master'

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

version

Distinguish between release and development builds

2014-01-23 13:18:05 +01:00

CMakeLists.txt

Merge remote-tracking branch 'upstream/master' into versioninfo

2014-02-03 02:27:24 +01:00

doc.hpp

second set of additional doxygen comments

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