David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # README.md # apps/openmw/mwgui/quickkeysmenu.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/combat.cpp		2018-07-04 01:52:29 +03:00
..
launcher	Adding panel for advanced settings.cfg options	2018-01-28 22:49:49 -06:00
mac	Adding CFBundleIdentifier to OpenMW's Info.plist file for Macs	2018-06-12 22:18:06 -05:00
mygui	Merge pull request #440 from OpenMW/master	2018-05-27 16:10:16 +03:00
opencs	Terrain texture brush frame	2018-05-10 11:18:54 +03:00
shaders	Merge branch 'master' into screenshot360	2018-06-13 21:16:28 +02:00
tes3mp	Remove Pawn support	2018-07-02 23:00:35 +08:00
ui	Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"	2018-06-28 20:13:18 -05:00
windows
wizard
CMakeLists.txt
gamecontrollerdb.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
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
openmw-cs.cfg
openmw-cs.desktop
openmw.appdata.xml	Slight appdata cleanup and improvement	2018-04-22 12:40:22 +02:00
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg	Merge branch 'master' into screenshot360	2018-06-13 21:16:28 +02:00
tes3mp-browser.desktop	[General] Add .desktop file for Server Browser	2017-09-02 16:30:52 +02:00
version.in