You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/apps/openmw/mwmp
David Cernat 8b482e19ec Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Objects.cpp
	apps/openmw-mp/Script/Functions/Objects.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
7 years ago
..
GUI Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 7 years ago
processors Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
ActorList.cpp [General] Change "enum ACTOR_ACTION" to "enum class Action" 7 years ago
ActorList.hpp [General] Modernize Script API 7 years ago
Cell.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Cell.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CellController.cpp Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CellController.hpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
DedicatedActor.cpp Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts 7 years ago
DedicatedActor.hpp [General] Implement ActorAI packet, part 1 7 years ago
DedicatedPlayer.cpp [General] Rework PlayerEquipment packets so they are of minimal size 7 years ago
DedicatedPlayer.hpp Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
GUIController.cpp Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts 7 years ago
GUIController.hpp Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts 7 years ago
LocalActor.cpp [General] Rework PlayerEquipment packets so they are of minimal size 7 years ago
LocalActor.hpp [Client] Use update timer in mwmp::Cell instead of LocalActor 8 years ago
LocalPlayer.cpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
LocalPlayer.hpp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Main.cpp Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Main.hpp [Client] Share WeatherManager to the mwmp::Main class 7 years ago
MechanicsHelper.cpp Merge pull request #423 from TES3MP/0.6.3 while resolving conflicts 7 years ago
MechanicsHelper.hpp [Client] Add and use enchantmentType argument for unequipItemsByEffect() 7 years ago
Networking.cpp Merge pull request #451 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Networking.hpp Merge pull request #441 from TES3MP/0.6.3 while resolving conflicts 7 years ago
ObjectList.cpp Merge pull request #453 from TES3MP/0.6.3 while resolving conflicts 7 years ago
ObjectList.hpp Merge pull request #430 from TES3MP/0.6.3 while resolving conflicts 7 years ago
PlayerList.cpp [Client] Use faster check for whether actors are DedicatedPlayers 7 years ago
PlayerList.hpp Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts 7 years ago
RecordHelper.cpp [General] Use RecordHelper methods to create and update DedicatedPlayers 7 years ago
RecordHelper.hpp [General] Use RecordHelper methods to create and update DedicatedPlayers 7 years ago
Worldstate.cpp Merge pull request #452 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Worldstate.hpp Merge pull request #452 from TES3MP/0.6.3 while resolving conflicts 7 years ago