David Cernat 672bb707a7 Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts ... # Conflicts: # apps/openmw-mp/Networking.cpp # apps/openmw-mp/Networking.hpp # apps/openmw-mp/Script/Functions/World.cpp # apps/openmw-mp/processors/WorldProcessor.cpp # apps/openmw-mp/processors/WorldProcessor.hpp # apps/openmw-mp/processors/world/ProcessorContainer.hpp # apps/openmw-mp/processors/world/ProcessorDoorState.hpp # apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp # apps/openmw-mp/processors/world/ProcessorObjectLock.hpp # apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp # apps/openmw-mp/processors/world/ProcessorObjectScale.hpp # apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp # apps/openmw-mp/processors/world/ProcessorObjectState.hpp # apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp # apps/openmw/mwmp/Networking.cpp # components/CMakeLists.txt # components/openmw-mp/Controllers/ObjectPacketController.hpp # components/openmw-mp/Controllers/WorldPacketController.cpp # components/openmw-mp/Packets/Object/ObjectPacket.cpp # components/openmw-mp/Packets/Object/ObjectPacket.hpp # components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp # components/openmw-mp/Packets/Object/PacketContainer.hpp # components/openmw-mp/Packets/Object/PacketDoorState.hpp # components/openmw-mp/Packets/Object/PacketMusicPlay.hpp # components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp # components/openmw-mp/Packets/Object/PacketObjectDelete.hpp # components/openmw-mp/Packets/Object/PacketObjectLock.hpp # components/openmw-mp/Packets/Object/PacketObjectMove.hpp # components/openmw-mp/Packets/Object/PacketObjectPlace.hpp # components/openmw-mp/Packets/Object/PacketObjectRotate.hpp # components/openmw-mp/Packets/Object/PacketObjectScale.hpp # components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp # components/openmw-mp/Packets/Object/PacketObjectState.hpp # components/openmw-mp/Packets/Object/PacketObjectTrap.hpp # components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp # components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp # components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp # components/openmw-mp/Packets/Object/PacketScriptMemberShort.hpp # components/openmw-mp/Packets/Object/PacketVideoPlay.hpp		2018-05-12 20:35:34 +03:00
..
bsa	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
compiler	allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061	2018-01-12 16:37:06 +01:00
config	Make hasMaster() behavior consistent with isGameFile() (fixes #3618)	2018-03-28 15:43:51 +03:00
contentselector	Assume Morrowind.esm dependency for dependency-less content addons (fixes #2829)	2018-04-29 14:56:38 +03:00
esm	Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts	2018-05-12 18:01:01 +03:00
esmterrain	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
fallback	Revert log spam	2018-04-22 15:41:25 +00:00
files	Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all	2017-11-11 22:58:02 +00:00
fontloader	[Fix] Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
interpreter	More consistent wording of errors/warnings	2017-03-04 21:48:31 +01:00
loadinglistener	LoadingScreen: add support for important labels	2015-12-15 21:16:20 +01:00
misc	Fix crash when rollDice is called with 0.	2018-04-21 16:46:36 +03:00
myguiplatform	purge unnecessary imports	2017-06-09 19:08:53 +02:00
nif	Handle NiLookAtController (feature #4407)	2018-04-29 09:24:13 +04:00
nifbullet	removed the unnecessary comment	2018-02-09 16:34:55 +01:00
nifosg	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
openmw-mp	Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts	2018-05-12 20:35:34 +03:00
process	OSX build fix	2014-11-20 18:14:49 +01:00
resource	Add NPC base skeleton files to the optimizer blacklist (Fixes #4159)	2017-11-10 22:51:32 +00:00
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	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
shader	Reduce error spam	2017-11-08 00:24:03 +00:00
terrain	Fix timing error	2018-02-13 18:25:28 +00:00
to_utf8	Fix typo in a comment	2015-12-10 00:15:55 +01:00
translation	Merge pull request #228 from OpenMW/master while resolving conflicts	2017-06-18 18:16:10 +03:00
version	Allow getting available version information even when clone is shallow	2017-03-07 21:53:49 +01:00
vfs	Ignore duplicate data directories to work around the fallout of (Fixes #3557)	2018-01-14 00:25:20 +00:00
widgets	Add an option to disable GUI keyboard navigation (Bug #4333)	2018-03-08 23:39:35 +00:00
CMakeLists.txt	Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts	2018-05-12 20:35:34 +03:00
doc.hpp	second set of additional doxygen comments	2010-09-25 20:15:05 +02:00