mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-25 20:39:41 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps/openmw
History
David Cernat d4dbfdfdb6 Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	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/mwgui/container.cpp
	apps/openmw/mwmp/Networking.cpp
	apps/openmw/mwmp/ObjectList.cpp
	apps/openmw/mwmp/ObjectList.hpp
	apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
	components/CMakeLists.txt
	components/openmw-mp/Base/BaseObject.hpp
	components/openmw-mp/Packets/Object/ObjectPacket.cpp
	components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
	components/openmw-mp/Packets/Object/PacketContainer.cpp
	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/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-13 03:20:01 +03:00
..
mwbase [Client] Fix GCC build 2018-05-10 07:16:33 +03:00
mwclass [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
mwdialogue Merge pull request #389 from OpenMW/master 2018-02-25 22:05:32 +02:00
mwgui Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
mwinput Merge pull request #400 from OpenMW/master while resolving conflicts 2018-04-03 01:25:17 +03:00
mwmechanics Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
mwmp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
mwphysics Merge pull request #395 from OpenMW/master while resolving conflicts 2018-03-29 07:28:30 +03:00
mwrender [General] Implement sending of image data for map tiles in PlayerMap 2018-05-08 05:57:04 +03:00
mwscript [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
mwsound Merge pull request #1686 2018-04-25 10:27:38 +00:00
mwstate minor code cleanup 2018-05-07 09:54:42 +02:00
mwworld Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
android_commandLine.cpp
android_commandLine.h
android_main.c android: Update for sdl 2.0.8 2018-03-30 12:44:38 -04:00
CMakeLists.txt Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
crashcatcher.cpp crashcatcher: complain when launching gdb fails 2017-02-23 23:28:49 +01:00
doc.hpp Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
engine.cpp Merge pull request #370 from TES3MP/0.6.2 2018-01-10 03:51:07 +02:00
engine.hpp Don't increase simulationTime while the game is minimized (Fixes #4211) 2017-11-16 18:48:49 +00:00
main.cpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 2018-01-29 02:57:48 +02:00