David Cernat b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try ... Conflicts: apps/openmw-mp/Networking.cpp apps/openmw-mp/Script/Functions/Miscellaneous.cpp apps/openmw-mp/Script/Functions/Miscellaneous.hpp apps/openmw/mwmp/GUI/GUIChat.cpp		2018-01-05 21:24:14 +02:00
..
launcher
mac	[macOS] Fixes accidental loading of plugins from system-wide Qt install	2017-07-30 15:43:45 +02:00
mygui	[General] Introduce chat channels	2017-12-08 07:43:29 +08: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	[Server] Rename server "plugins"/"mods" into "modules" for clarity	2017-12-02 15:39:08 +02:00
ui	Changing "New Installation" to "Retail CD/DVD" for clarity	2017-08-09 00:20:49 -05: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	2017-01-28 11:02:06 +01:00
openmw-cs.cfg	changed name of openmw-cs user settings file	2015-12-15 14:51:25 +01:00
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	Update Links to Documentation in settings.cfg files (#1523)	2017-10-28 16:05:30 +00:00
tes3mp-browser.desktop	[General] Add .desktop file for Server Browser	2017-09-02 16:30:52 +02:00
version.in	Move OpenMW version information to a textfile instead of compiling it in	2015-07-18 03:09:04 +02:00