graffy76 8d12e2b99d fixed merge conflicts ...

Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp

2013-11-02 09:31:23 -05:00

..

bsa

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

compiler

Implement Disable/EnableLevitation script functions

2013-10-02 15:33:20 +02:00

contentselector

fixed merge conflicts

2013-11-02 09:31:23 -05:00

esm

Merge branch 'master' into esxSelector

2013-10-25 08:11:24 -05:00

file_finder

Issue #133 Handle resources across multiple data directories

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

files

added FileWidget; fixed OpenCS configuration

2013-09-08 14:31:20 +02:00

interpreter

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

loadinglistener

Refactored loading screen

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

misc

Play randomized werewolf sounds

2013-08-11 00:53:17 -07:00

nif

Fixed "most vexing parse" issue.

2013-09-22 04:57:01 -04:00

nifbullet

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

nifogre

Add Ogre::Light objects to the object list

2013-08-06 19:49:01 -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

Replaced log2 to make VC happy

2013-08-27 16:08:58 +02: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

CMakeLists.txt

Reimplemented constentselector view class

2013-10-22 21:52:35 -05:00

doc.hpp

second set of additional doxygen comments

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