1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-07 05:45:31 +00:00
openmw-tes3mp/components/openmw-mp
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
..
Base Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Controllers Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Master [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Packets Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Log.hpp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
NetworkMessages.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 2018-06-07 23:23:19 +03:00
Utils.cpp [General] Add and use utility function for int value checks in vectors 2018-04-19 18:16:10 +03:00
Utils.hpp [General] Add and use utility function for int value checks in vectors 2018-04-19 18:16:10 +03:00
Version.hpp [General] Update version to 0.6.3 2018-01-27 23:36:25 +02:00