scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout

2015-02-27 22:21:02 +01:00

..

launcher

Merge branch 'master' into HEAD

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

mac

OpenCS.app icon & bundle properties

2013-11-10 20:11:53 +04:00

materials

Implement drawMode of NiStencilProperty (Feature #1057)

2014-12-03 18:28:35 +01:00

mygui

Merge remote-tracking branch 'upstream/master'

2015-02-27 22:21:02 +01:00

opencs

new element visibility button icons

2014-11-28 09:14:02 +01:00

ui

Change "Profile" to "Content List" in user visible strings in Launcher. (Fixes #810)

2015-01-10 15:04:45 +13:00

water

…

windows

Add icon to windows executable.

2014-11-24 12:48:36 +11:00

wizard

Added some eye-candy to the wizard: a watermark and a placeholder icon

2014-03-17 17:50:51 +01:00

CMakeLists.txt

Minor code cleanup

2015-02-27 22:19:08 +01:00

gamecontrollerdb.txt

Joystick Support

2014-12-08 21:57:32 -06:00

opencs.desktop

Update opencs.desktop

2014-01-16 08:41:29 +01:00

opencs.ini

Removed all content from opencs.ini

2014-10-16 14:50:25 +02:00

openmw-mimeinfo.xml

Add freedesktop.org mimeinfo for OpenMW save game files

2015-01-07 15:08:57 +01:00

openmw.bmp

…

openmw.cfg

label local/global openmw.cfg files (Fixes #2196)

2014-12-08 20:08:59 +01:00

openmw.cfg.local

label local/global openmw.cfg files (Fixes #2196)

2014-12-08 20:08:59 +01:00

openmw.desktop

Add freedesktop.org mimeinfo for OpenMW save game files

2015-01-07 15:08:57 +01:00

settings-default.cfg

Merge remote-tracking branch 'upstream/master'

2015-02-27 22:21:02 +01:00

transparency-overrides.cfg

…