David Cernat 2390744b45 Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Player.hpp apps/openmw-mp/Script/Functions/Mechanics.cpp apps/openmw-mp/Script/Functions/Mechanics.hpp apps/openmw-mp/Script/Functions/Settings.hpp apps/openmw-mp/Script/Functions/Stats.cpp apps/openmw-mp/Script/Functions/Stats.hpp components/openmw-mp/Base/BasePlayer.hpp		2018-04-10 08:20:23 +03:00
..
launcher	Adding panel for advanced settings.cfg options	2018-01-28 22:49:49 -06:00
mac	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
mygui	[General] Introduce chat channels	2017-12-08 07:43:29 +08:00
opencs
shaders	remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb	2018-03-27 20:20:40 +02:00
tes3mp	[Browser] Add compatibility compilation mode	2018-04-02 14:04:48 +08:00
ui	Adding Max Quicksaves setting to Launcher	2018-02-27 20:17:21 -06: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	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg	Merge pull request #1473	2018-04-09 20:23:43 +00:00
tes3mp-browser.desktop	[General] Add .desktop file for Server Browser	2017-09-02 16:30:52 +02:00
version.in