mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 08:23:51 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps/openmw/mwmp
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
..
GUI Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
processors Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
ActorList.cpp [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
ActorList.hpp [General] Modernize Script API 2017-08-28 00:15:56 +08:00
Cell.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
Cell.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
CellController.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
CellController.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
DedicatedActor.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 2018-05-12 18:01:01 +03:00
DedicatedActor.hpp [General] Implement ActorAI packet, part 1 2018-05-12 06:29:11 +03:00
DedicatedPlayer.cpp [General] Rework PlayerEquipment packets so they are of minimal size 2018-04-20 22:46:16 +03:00
DedicatedPlayer.hpp Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 2018-04-18 18:29:00 +03:00
GUIController.cpp Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts 2018-04-10 08:20:23 +03:00
GUIController.hpp Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts 2018-01-27 21:14:24 +02:00
LocalActor.cpp [General] Rework PlayerEquipment packets so they are of minimal size 2018-04-20 22:46:16 +03:00
LocalActor.hpp [Client] Use update timer in mwmp::Cell instead of LocalActor 2017-06-10 03:29:51 +03:00
LocalPlayer.cpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
LocalPlayer.hpp Merge pull request #418 from TES3MP/0.6.3 while resolving conflicts 2018-05-10 22:33:36 +03:00
Main.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
Main.hpp [Client] Share WeatherManager to the mwmp::Main class 2017-12-10 09:53:36 +08:00
MechanicsHelper.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
MechanicsHelper.hpp [Client] Add and use enchantmentType argument for unequipItemsByEffect() 2018-01-27 19:37:16 +02:00
Networking.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
Networking.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
ObjectList.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
ObjectList.hpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 2018-05-13 03:20:01 +03:00
PlayerList.cpp [Client] Streamline creation of references for DedicatedPlayers 2018-04-08 15:02:43 +03:00
PlayerList.hpp Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts 2018-04-10 08:20:23 +03:00
RecordHelper.cpp [General] Use RecordHelper methods to create and update DedicatedPlayers 2018-04-13 08:37:06 +03:00
RecordHelper.hpp [General] Use RecordHelper methods to create and update DedicatedPlayers 2018-04-13 08:37:06 +03:00