Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame' ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwbase/soundmanager.hpp apps/openmw/mwgui/mapwindow.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwsound/soundmanagerimp.hpp components/esm/loadcell.cpp		2014-02-01 18:16:32 +01:00
..
launcher
mac	OpenCS.app icon & bundle properties	2013-11-10 20:11:53 +04:00
materials	Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.	2014-01-11 00:51:03 +01:00
mygui	Merge branch 'savedgame'	2014-02-01 18:16:32 +01:00
opencs
ui	Fix for file path issues	2013-10-26 22:55:44 -05:00
water
CMakeLists.txt
opencs.cfg
opencs.desktop	Update opencs.desktop	2014-01-16 08:41:29 +01:00
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop	Update openmw.desktop	2014-01-16 08:44:56 +01:00
settings-default.cfg	Merge branch 'master' into HEAD	2014-01-06 00:23:17 +01:00
transparency-overrides.cfg