David Cernat a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts ... Conflicts: apps/openmw-mp/Script/Functions/Actors.cpp apps/openmw-mp/Script/Functions/Actors.hpp apps/openmw-mp/Script/Functions/Items.cpp apps/openmw-mp/Script/Functions/Items.hpp apps/openmw-mp/Script/Functions/World.cpp apps/openmw-mp/Script/Functions/World.hpp apps/openmw/mwmp/WorldEvent.cpp components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp components/openmw-mp/Version.hpp		2018-01-18 13:40:13 +02:00
..
Base	Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts	2018-01-18 13:40:13 +02:00
Controllers	Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try	2018-01-01 12:04:25 +02:00
Master	[General] Simplify ProxyMasterPacket	2018-01-05 09:06:24 +08:00
Packets	Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts	2018-01-18 13:40:13 +02:00
Log.hpp	[General] Use consistent code style	2017-11-29 13:00:22 +02:00
NetworkMessages.hpp	Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try	2018-01-01 12:04:25 +02:00
Utils.cpp	[General] Add and use utility function for int value checks in vectors	2017-11-26 13:03:54 +02:00
Utils.hpp	[General] Add and use utility function for int value checks in vectors	2017-11-26 13:03:54 +02:00
Version.hpp	[General] Update version to 0.6.2-hotfixed	2018-01-17 08:10:49 +02:00