Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master' ...

Conflicts:
	apps/openmw/CMakeLists.txt

2014-04-15 11:31:48 +02:00

..

bsa

Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog

2014-03-19 10:23:15 +01:00

compiler

Fix typos

2014-03-22 19:01:41 +01:00

contentselector

Fixed the content selector checkboxes appearing as partially checked

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

esm

Merge remote-tracking branch 'jeffreyhaines/master'

2014-04-15 11:31:48 +02:00

file_finder

Issue #133 Handle resources across multiple data directories

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

files

remove our stdint.h version that uses boost and force usage of system stdint.h

2014-03-05 17:08:58 +01:00

interpreter

Fixed code issues found with unity build. Missing include guards, duplicated functions, ...

2014-03-16 23:49:06 +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

remove our stdint.h version that uses boost and force usage of system stdint.h

2014-03-05 17:08: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

General perfomance optimizations.

2014-03-30 19:45:27 +04: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

Include some more required Ogre headers explicitely.

2014-03-05 21:46:37 +01:00

settings

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

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

terrain

Yet another terrain fix

2014-03-16 16:30:17 +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 'slothlife/weather_save'

2014-03-23 08:36:45 +01:00

doc.hpp

second set of additional doxygen comments

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