David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts ...

# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

2017-10-16 07:37:29 +03:00

..

launcher

…

mac

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

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

mygui

Merge pull request #313 from OpenMW/master while resolving conflicts

2017-10-16 07:37:29 +03:00

opencs

Mainly making compilable under OpenBSD.

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

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.txt

Update gamecontrollerdb.txt from upstream

2017-01-28 11:02:06 +01:00

openmw-cs.cfg

…

openmw-cs.desktop

…

openmw.appdata.xml

…

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

Increase the default buffer cache sizes

2017-09-14 16:00:42 -07:00

tes3mp-browser.desktop

[General] Add .desktop file for Server Browser

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

version.in

…