teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
openmw-tes3coop/apps
History
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
..
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 #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +03:00
openmw-mp Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 20:35:34 +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 first set of additional doxygen comments 2010-09-25 15:03:53 +02:00