David Cernat 5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts ...

# Conflicts:
#	apps/openmw/CMakeLists.txt

2018-01-27 22:52:59 +02:00

..

launcher

…

mac

[macOS] Fixes accidental loading of plugins from system-wide Qt install

2017-07-30 15:43:45 +02:00

mygui

Revert "Add slider for refraction size in settings window"

2018-01-01 13:28:14 +01:00

opencs

…

shaders

Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files

2017-10-11 21:58:55 +01:00

tes3mp

[General] Use address keys with clearer meaning in tes3mp config files

2017-07-03 01:31:48 +03:00

ui

Changing "New Installation" to "Retail CD/DVD" for clarity

2017-08-09 00:20:49 -05:00

windows

…

wizard

…

CMakeLists.txt

…

gamecontrollerdb_204.txt

Moving controller file out of the controllers subdirectory

2018-01-02 20:58:43 -06:00

gamecontrollerdb_205.txt

Moving controller file out of the controllers subdirectory

2018-01-02 20:58:43 -06:00

gamecontrollerdb.txt

Moving controller file out of the controllers subdirectory

2018-01-02 20:58:43 -06:00

openmw-cs.cfg

…

openmw-cs.desktop

…

openmw.appdata.xml

update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html

2018-01-01 19:47:36 +01:00

openmw.bmp

…

openmw.cfg

Remove evil "implicit GetJournalIndex" hack from expression parser

2017-04-03 01:44:26 +02:00

openmw.cfg.local

Remove evil "implicit GetJournalIndex" hack from expression parser

2017-04-03 01:44:26 +02:00

openmw.desktop

…

settings-default.cfg

Merge pull request #1580

2018-01-11 01:54:28 +00:00

tes3mp-browser.desktop

[General] Add .desktop file for Server Browser

2017-09-02 16:30:52 +02:00

version.in

…