Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ...

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg

2013-12-07 12:27:06 +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

Add parallax mapping for objects

2013-12-05 15:51:07 +01:00

mygui

Merge branch 'master' into savedgame

2013-12-07 12:27:06 +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

added keywords for debian and switch to dyn libs in travis

2013-11-20 10:16:51 +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

added keywords for debian and switch to dyn libs in travis

2013-11-20 10:16:51 +01:00

settings-default.cfg

Merge branch 'master' into savedgame

2013-12-07 12:27:06 +01:00

transparency-overrides.cfg

Added BM trees to transparency overrides

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