scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ...

Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp

2014-01-24 18:28:35 +01:00

..

launcher

Fixed paths to OpenMW icons

2013-03-12 21:21:08 +01:00

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 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

opencs

Merge remote-tracking branch 'sirherrbatka/filters' into saving

2013-10-21 18:59:12 +02:00

ui

Fix for file path issues

2013-10-26 22:55:44 -05:00

water

Simpler, more lightweight underwater effect, changed colors to match vanilla better

2013-03-03 19:28:11 +01:00

CMakeLists.txt

Added shader based MyGUI render manager to allow using Ogre's next generation render systems.

2013-04-07 00:12:04 +02:00

opencs.cfg

Deleted ".directory" text files.

2013-06-23 21:28:58 -05:00

opencs.desktop

Update opencs.desktop

2014-01-16 08:41:29 +01:00

openmw.bmp

Some improvments for windows builds and installer

2012-04-19 14:58:27 +02:00

openmw.cfg

fixed data-local path

2013-07-31 13:55:56 +02:00

openmw.cfg.local

fixed local openmw.cfg file

2013-09-07 09:30:40 +02:00

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

Added BM trees to transparency overrides

2013-03-04 17:57:35 +01:00