gugus 0553227ee1 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ...

Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/player.cpp
	apps/openmw/mwworld/player.hpp

2012-04-09 14:43:35 +02:00

..

mwclass

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2

2012-04-09 14:43:35 +02:00

mwdialogue

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2

2012-04-09 14:43:35 +02:00

mwgui

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

2012-04-07 17:30:20 +03:00

mwinput

only fists support lacks

2012-04-08 13:17:16 +02:00

mwmechanics

Merge remote branch 'minty3/testbranch'

2012-04-08 23:40:48 +02:00

mwrender

- fixes to texture filtering setting

2012-04-09 00:10:42 +02:00

mwscript

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2

2012-04-09 14:43:35 +02:00

mwsound

Add sound volume settings

2012-04-07 16:00:30 -07:00

mwworld

Merge remote branch 'minty3/testbranch'

2012-04-08 23:40:48 +02:00

CMakeLists.txt

cmake fix

2012-04-08 23:44:40 +02:00

config.hpp.cmake

another minor correction (fixing the previous one)

2011-07-08 16:16:06 +02:00

doc.hpp

first set of additional doxygen comments

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

engine.cpp

Merge branch 'master' into water

2012-04-08 16:11:16 +02:00

engine.hpp

parse fallback with boost program option custom validators

2012-04-03 02:14:39 +02:00

main.cpp

Revert "test commit"

2012-04-08 11:30:17 +02:00