1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 13:53:52 +00:00
openmw-tes3mp/apps/openmw/mwmp
David Cernat 4846497078 Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Positions.cpp
	apps/openmw-mp/Script/Functions/Positions.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw-mp/Script/Script.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	components/openmw-mp/Base/BasePlayer.hpp
2018-05-02 23:15:39 +03:00
..
GUI Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-05 21:24:14 +02:00
processors Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
ActorList.cpp [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
ActorList.hpp [General] Modernize Script API 2017-08-28 00:15:56 +08:00
Cell.cpp [General] Rework PlayerEquipment packets so they are of minimal size 2018-04-20 22:46:16 +03:00
Cell.hpp [Client] Mark trivial destructor as default, remove "virtual" keyword 2018-01-19 15:56:01 +08:00
CellController.cpp Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts 2018-04-01 11:34:04 +03:00
CellController.hpp Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts 2018-04-01 11:34:04 +03:00
DedicatedActor.cpp [General] Rework PlayerEquipment packets so they are of minimal size 2018-04-20 22:46:16 +03:00
DedicatedActor.hpp [Client] Fix problems with NPC equipment sync 2017-06-09 04:58:56 +03:00
DedicatedPlayer.cpp [General] Rework PlayerEquipment packets so they are of minimal size 2018-04-20 22:46:16 +03:00
DedicatedPlayer.hpp Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 2018-04-18 18:29:00 +03:00
GUIController.cpp Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts 2018-04-10 08:20:23 +03:00
GUIController.hpp Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts 2018-01-27 21:14:24 +02:00
LocalActor.cpp [General] Rework PlayerEquipment packets so they are of minimal size 2018-04-20 22:46:16 +03:00
LocalActor.hpp [Client] Use update timer in mwmp::Cell instead of LocalActor 2017-06-10 03:29:51 +03:00
LocalPlayer.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
LocalPlayer.hpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
Main.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
Main.hpp [Client] Share WeatherManager to the mwmp::Main class 2017-12-10 09:53:36 +08:00
MechanicsHelper.cpp Merge pull request #402 from TES3MP/0.6.3 2018-04-05 12:53:38 +03:00
MechanicsHelper.hpp [Client] Add and use enchantmentType argument for unequipItemsByEffect() 2018-01-27 19:37:16 +02:00
Networking.cpp Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 2018-01-18 13:40:13 +02:00
Networking.hpp [Client] Add network statistics (CTRL+F2) 2017-10-28 00:39:46 +08:00
PlayerList.cpp [Client] Streamline creation of references for DedicatedPlayers 2018-04-08 15:02:43 +03:00
PlayerList.hpp Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts 2018-04-10 08:20:23 +03:00
RecordHelper.cpp [General] Use RecordHelper methods to create and update DedicatedPlayers 2018-04-13 08:37:06 +03:00
RecordHelper.hpp [General] Use RecordHelper methods to create and update DedicatedPlayers 2018-04-13 08:37:06 +03:00
WorldEvent.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00
WorldEvent.hpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 2018-05-02 23:15:39 +03:00