David Cernat
|
176aa62b15
|
Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/Script/Functions/Cells.cpp
apps/openmw-mp/Script/Functions/Cells.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
|
2018-06-07 23:23:19 +03:00 |
|
David Cernat
|
72862dc255
|
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
|
2018-06-07 12:51:45 +03:00 |
|
David Cernat
|
3f7e163c92
|
Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
apps/openmw-mp/CMakeLists.txt
apps/openmw-mp/Script/Functions/GUI.cpp
apps/openmw-mp/Script/Functions/GUI.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
components/CMakeLists.txt
components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
|
2018-05-25 06:34:07 +03:00 |
|
David Cernat
|
0be6de6607
|
[General] Turn RecordDynamic into a Worldstate packet
|
2018-05-23 07:48:28 +03:00 |
|