Bret Curtis c1eb9042b3 Merge branch 'master' into terrainbleeding		2018-06-19 13:40:14 +02:00
..
bsa
compiler	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
config	Make hasMaster() behavior consistent with isGameFile() (fixes #3618)	2018-03-28 15:43:51 +03:00
contentselector	Merged pull request #1623	2018-06-09 10:49:04 +02:00
esm	Store previous items in the savegame	2018-06-10 16:21:19 +04:00
esmterrain	Fix #4452 and remove dead code	2018-06-12 21:04:27 -04:00
fallback	Revert log spam	2018-04-22 15:41:25 +00:00
files
fontloader	[Fix] Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
interpreter
loadinglistener
misc	Revert "Don't force DDS file usage (fixes #1392)"	2018-06-04 17:08:09 +02:00
myguiplatform
nif	Fix assertion fail related to NiLookAtController	2018-06-09 17:07:38 +04:00
nifbullet
nifosg	Improve MRK NiStringExtraData handling (bug #4419)	2018-06-08 15:44:35 +04:00
process
resource
sceneutil	Add an empty compileGLObjects implementation to Rig/MorphGeometry to avoid unnecessary creation of display list done by osg	2018-04-18 12:36:08 +00:00
sdlutil	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
settings
shader
terrain	Merge branch 'master' into terrainbleeding	2018-06-19 13:40:14 +02:00
to_utf8
translation
version
vfs
widgets	Fix warnings: catching polymorphic type by value	2018-06-02 14:28:46 +03:00
CMakeLists.txt	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
doc.hpp