David Cernat ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Player.cpp apps/openmw-mp/Script/Functions/Mechanics.cpp apps/openmw-mp/Script/Functions/Mechanics.hpp apps/openmw-mp/Script/Functions/Quests.cpp apps/openmw-mp/Script/Functions/Quests.hpp apps/openmw-mp/Script/ScriptFunctions.hpp apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp apps/openmw/mwmp/LocalPlayer.hpp apps/openmw/mwmp/WorldEvent.cpp apps/openmw/mwworld/worldimp.cpp components/openmw-mp/Base/BasePlayer.hpp		2018-02-12 06:50:52 +02:00
..
Base	Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts	2018-02-12 06:50:52 +02:00
Controllers	Merge pull request #380 from TES3MP/0.6.3	2018-01-30 16:05:24 +02:00
Master	[General] Simplify ProxyMasterPacket	2018-01-05 09:06:24 +08:00
Packets	Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts	2018-02-12 06:50:52 +02:00
Log.hpp	[General] Use consistent code style	2017-11-29 13:00:22 +02:00
NetworkMessages.hpp	Merge pull request #380 from TES3MP/0.6.3	2018-01-30 16:05:24 +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.3	2018-01-27 23:36:25 +02:00