David Cernat b5922d18fd Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts ... # Conflicts: # apps/openmw-mp/Networking.cpp # apps/openmw-mp/Script/Functions/Objects.cpp # apps/openmw-mp/Script/Functions/Objects.hpp # apps/openmw-mp/processors/ObjectProcessor.cpp # apps/openmw-mp/processors/object/ProcessorContainer.hpp # apps/openmw-mp/processors/object/ProcessorDoorState.hpp # apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp # apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp # apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp # apps/openmw-mp/processors/object/ProcessorObjectLock.hpp # apps/openmw-mp/processors/object/ProcessorObjectMove.hpp # apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp # apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp # apps/openmw-mp/processors/object/ProcessorObjectScale.hpp # apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp # apps/openmw-mp/processors/object/ProcessorObjectState.hpp # apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp # apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp # apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp # apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp # apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp # apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp # apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp # apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp # apps/openmw/mwmp/Networking.cpp # apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp # apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp # apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp # apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp # apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp # apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp # apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp		2018-05-16 06:28:24 +03:00
..
browser	[Browser] Add compatibility compilation mode	2018-04-02 14:04:48 +08:00
bsatool	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
esmtool	Dropping a separate NPDTstruct12 object and instead use NPDTstruct52	2018-05-09 00:25:07 +02:00
essimporter	Dropping a separate NPDTstruct12 object and instead use NPDTstruct52	2018-05-09 00:25:07 +02:00
launcher	Merge pull request #408 from OpenMW/master	2018-04-18 18:05:09 +03:00
master	[General] Use correct versions of C++ per target	2018-02-16 16:31:45 +08:00
mwiniimporter	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
niftest	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
opencs	Merge pull request #420 from OpenMW/master	2018-05-12 06:32:01 +03:00
openmw	Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts	2018-05-16 06:28:24 +03:00
openmw-mp	Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts	2018-05-16 06:28:24 +03:00
openmw_test_suite	Merge pull request #1698 from Capostrophic/c++11	2018-05-06 10:44:11 +02:00
wizard	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
doc.hpp