mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 08:45:36 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps
History
David Cernat 3f7e163c92 Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
	components/CMakeLists.txt
	components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
2018-05-25 06:34:07 +03:00
..
browser [Browser] Add compatibility compilation mode 2018-04-02 14:04:48 +08:00
bsatool Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
esmtool Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 2018-05-09 00:25:07 +02:00
essimporter Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 2018-05-09 00:25:07 +02:00
launcher Merge pull request #436 from OpenMW/master 2018-05-23 00:40:51 +03:00
master [General] Use correct versions of C++ per target 2018-02-16 16:31:45 +08:00
mwiniimporter Read data paths from data-local section too 2018-05-17 21:07:20 +03:00
niftest Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
opencs Merge pull request #432 from OpenMW/master 2018-05-20 23:48:53 +03:00
openmw Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
openmw-mp Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
openmw_test_suite Merge pull request #1698 from Capostrophic/c++11 2018-05-06 10:44:11 +02:00
wizard Merged pull request #1697 2018-05-23 16:01:11 +02:00
doc.hpp