graffy76 f87eb67968 Fixed conflicts ...

Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp

2013-06-17 06:45:44 -05:00

..

launcher

Fixed paths to OpenMW icons

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

mac

Synchronized OS X icon with our current app icon

2012-03-31 19:36:07 +04:00

materials

Version should be 100 for GLSLES

2013-05-25 05:40:35 +02:00

mygui

Use Morrowind's fonts

2013-06-06 22:26:06 +02:00

opencs

Fixed conflicts

2013-06-17 06:45:44 -05:00

ui

Fix for duplicate key/value pairs being written to settings.cfg, Bug #755

2013-06-02 21:43:22 +02: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.desktop

put .desktop file in the right directory

2013-03-09 14:43:44 -05:00

openmw.bmp

Some improvments for windows builds and installer

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

openmw.cfg

Fixed typo on openmw.cfg that caused launcher crash on OS X

2012-09-22 13:03:58 +04:00

openmw.cfg.local

create local openmw.cfg file for uninstalled version

2011-04-28 21:55:08 +02:00

openmw.desktop

Issue #423: Wrong usage of "Version"

2012-10-16 23:16:14 +03:00

settings-default.cfg

Disable mipmaps generation

2013-03-04 16:28:20 +01:00

transparency-overrides.cfg

Added BM trees to transparency overrides

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