David Cernat 47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts ...

# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp

2016-10-24 09:18:21 +03:00

..

launcher

Merge branch 'master' into HEAD

2014-11-18 17:43:51 +01:00

mac

OS X: enable high resolution mode for OpenMW & OpenCS

2015-08-15 22:37:09 +02:00

mygui

Resolve conflicts in pull request #75

2016-10-14 18:34:17 +03:00

opencs

Mainly making compilable under OpenBSD.

2016-08-06 19:00:27 +01:00

shaders

Attenuate the light ambient in lighting.glsl (Fixes #3597)

2016-10-17 15:01:10 +02:00

tes3mp

Make tes3mp config files less confusing

2016-09-27 16:40:12 +03:00

ui

Add some values to launcher's antialiasing combobox

2015-06-05 02:48:51 +02:00

windows

renamed opencs into openmw-cs

2015-02-03 13:18:03 +01:00

wizard

…

CMakeLists.txt

New water WIP

2015-10-29 00:25:23 +01:00

gamecontrollerdb.txt

Update gamecontrollerdb.txt from upstream.

2016-07-07 18:31:49 +02:00

openmw-cs.cfg

changed name of openmw-cs user settings file

2015-12-15 14:51:25 +01:00

openmw-cs.desktop

renamed opencs into openmw-cs

2015-02-03 13:18:03 +01:00

openmw.appdata.xml

Rewrite of the description

2015-08-04 22:50:53 +02:00

openmw.bmp

…

openmw.cfg

Don't add the autodetected mw path in global config file

2016-04-17 17:17:07 +02:00

openmw.cfg.local

Don't add the autodetected mw path in global config file

2016-04-17 17:17:07 +02:00

openmw.desktop

Revert "Add freedesktop.org mimeinfo for OpenMW save game files"

2015-02-07 23:24:27 +01:00

settings-default.cfg

Add a setting for merchant auto-equipping prevention

2016-10-19 02:22:49 +02:00

version.in

Move OpenMW version information to a textfile instead of compiling it in

2015-07-18 03:09:04 +02:00