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
David Cernat 176aa62b15 Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Cells.cpp
	apps/openmw-mp/Script/Functions/Cells.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
	apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
	components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
7 years ago
..
browser [Browser] Add compatibility compilation mode 7 years ago
bsatool Restore trailing new lines to shrink PR 7 years ago
esmtool Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 7 years ago
essimporter Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 7 years ago
launcher Merge pull request #436 from OpenMW/master 7 years ago
master [General] Use correct versions of C++ per target 7 years ago
mwiniimporter Read data paths from `data-local` section too 7 years ago
niftest Some PVS-Studio and cppcheck fixes 7 years ago
opencs Merge pull request #440 from OpenMW/master 7 years ago
openmw Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
openmw-mp Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts 7 years ago
openmw_test_suite Merge pull request #1698 from Capostrophic/c++11 7 years ago
wizard Merged pull request #1697 7 years ago
doc.hpp