scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting ...

Conflicts:
	apps/opencs/view/render/instancemode.cpp

2016-01-15 15:46:10 +01:00

..

dialoguemanager.hpp

Several warning fixes

2015-01-23 15:34:47 +01:00

environment.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

environment.hpp

Include cleanup

2015-02-05 04:18:42 +01:00

inputmanager.hpp

Stop rendering when the window is minimized

2015-09-04 03:44:14 +02:00

journal.hpp

Accept an implicit reference in Journal (Fixes #3135)

2016-01-11 23:07:01 +01:00

mechanicsmanager.hpp

Move werewolf functions from World to MechanicsManager

2015-12-26 18:23:13 +01:00

scriptmanager.hpp

added missing const to ScriptManager::getLocals

2014-07-25 08:12:53 +02:00

soundmanager.hpp

Use a ConstPtr in SoundManager

2015-12-18 18:11:30 +01:00

statemanager.hpp

Add commandline option to load a save game on startup

2015-01-07 03:27:24 +01:00

windowmanager.hpp

Remove old FPS setting code

2015-11-07 00:13:13 +01:00

world.hpp

Merge branch 'master' of https://github.com/OpenMW/openmw into lighting

2016-01-15 15:46:10 +01:00