krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/components/openmw-mp
History
David Cernat d58efde3f1 Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Chat.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorPlayerCharGen.hpp
	apps/openmw/mwmp/Cell.cpp
	apps/openmw/mwmp/DedicatedActor.cpp
	apps/openmw/mwmp/DedicatedPlayer.cpp
	apps/openmw/mwmp/LocalActor.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/Main.cpp
	components/openmw-mp/Base/BaseActor.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
	components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
2018-04-21 16:55:05 +03:00
..
Base Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts 2018-04-21 16:55:05 +03:00
Controllers [General] Move similar functions to BasePacketController 2018-02-26 21:03:08 +08:00
Master [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Packets Merge pull request #410 from TES3MP/0.6.3 while resolving conflicts 2018-04-21 16:55:05 +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 #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 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