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-tes3coop/apps/openmw/mwmp
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
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 #384 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 [Client] Mark trivial destructor as default, remove "virtual" keyword 7 years ago
Cell.hpp [Client] Mark trivial destructor as default, remove "virtual" keyword 7 years ago
CellController.cpp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
CellController.hpp Merge pull request #370 from TES3MP/0.6.2 7 years ago
DedicatedActor.cpp [Client] Fix build 7 years ago
DedicatedActor.hpp [Client] Fix problems with NPC equipment sync 8 years ago
DedicatedPlayer.cpp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
DedicatedPlayer.hpp Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 7 years ago
GUIController.cpp Merge pull request #373 from TES3MP/0.6.2 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] Change regular enums to enum class 7 years ago
LocalActor.hpp [Client] Use update timer in mwmp::Cell instead of LocalActor 8 years ago
LocalPlayer.cpp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
LocalPlayer.hpp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
Main.cpp [Client] Share WeatherManager to the mwmp::Main class 7 years ago
Main.hpp [Client] Share WeatherManager to the mwmp::Main class 7 years ago
MechanicsHelper.cpp Merge pull request #373 from TES3MP/0.6.2 while resolving conflicts 7 years ago
MechanicsHelper.hpp [Client] Add and use enchantmentType argument for unequipItemsByEffect() 7 years ago
Networking.cpp Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 7 years ago
Networking.hpp [Client] Add network statistics (CTRL+F2) 7 years ago
PlayerList.cpp [General] Change NULL to nullptr 8 years ago
PlayerList.hpp [General] Introduce chat channels 7 years ago
WorldEvent.cpp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
WorldEvent.hpp Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 7 years ago