scrawl c27c20a859 Merge remote-tracking branch 'upstream/openmw-35' into HEAD ...

Conflicts:
	files/materials/water.shader

2015-02-09 19:40:59 +01:00

..

mwbase

Merge remote-tracking branch 'ace/include-cleanup'

2015-02-09 18:03:28 +01:00

mwclass

Move manualref code out of header

2015-02-09 15:01:49 +01:00

mwdialogue

Move manualref code out of header

2015-02-09 15:01:49 +01:00

mwgui

Merge remote-tracking branch 'ace/include-cleanup'

2015-02-09 18:03:28 +01:00

mwinput

Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up

2015-01-13 05:37:44 +01:00

mwmechanics

Remove a large include form mwbase/windowmanager.hpp

2015-02-09 16:23:41 +01:00

mwrender

Merge remote-tracking branch 'upstream/openmw-35' into HEAD

2015-02-09 19:40:59 +01:00

mwscript

Merge remote-tracking branch 'ace/include-cleanup'

2015-02-09 18:03:28 +01:00

mwsound

Fix setWaterLevel script instruction not affecting physics

2015-02-08 15:50:40 +01:00

mwstate

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

mwworld

Merge remote-tracking branch 'upstream/openmw-35' into HEAD

2015-02-09 19:40:59 +01:00

android_main.c

fixe all code v 2

2014-08-06 00:46:21 +04:00

CMakeLists.txt

Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714)

2015-02-07 04:05:28 +01:00

crashcatcher.cpp

make it C98 compat

2014-12-23 17:13:11 +01:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00

engine.cpp

Merge remote-tracking branch 'upstream/openmw-35' into HEAD

2015-02-09 19:40:59 +01:00

engine.hpp

Remove unused function

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

main.cpp

Adjust help for --load-savegame again

2015-02-06 01:27:16 +01:00