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
..
bsa
compiler	Resolve merge conflicts	2018-06-13 08:22:37 +02:00
config
contentselector	Merged pull request #1623	2018-06-09 10:49:04 +02:00
esm	Merge pull request #456 from OpenMW/master while resolving conflicts	2018-07-04 01:52:29 +03:00
esmterrain	Initialize some missing fields in constructors	2018-06-25 09:35:42 +04:00
fallback
files
fontloader
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
openmw-mp	[General] Allow different types for vectorContains	2018-07-04 01:31:45 +08:00
process
resource
sceneutil
sdlutil	Force software decompression if OPENMW_DECOMPRESS_TEXTURES is set	2018-06-16 12:38:16 +02:00
settings
shader
terrain	Initialize some missing fields in constructors	2018-06-25 09:35:42 +04:00
to_utf8
translation
version
vfs
widgets	Initialize some missing fields in constructors	2018-06-25 09:35:42 +04:00
CMakeLists.txt	Merge pull request #456 from OpenMW/master while resolving conflicts	2018-07-04 01:52:29 +03:00
doc.hpp