mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-25 21:39:40 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps
History
David Cernat 3d5860d6f4 Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Settings.cpp
	apps/openmw-mp/Script/Functions/Settings.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwgui/container.cpp
	apps/openmw/mwmp/LocalActor.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
	components/openmw-mp/Base/BaseEvent.hpp
	components/openmw-mp/Log.cpp
	components/openmw-mp/Log.hpp
2018-03-30 09:32:43 +03:00
..
browser [General] Use correct versions of C++ per target 2018-02-16 16:31:45 +08:00
bsatool Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
esmtool Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
essimporter ESS-Importer: Convert magic projectiles (Closes #2320) 2017-09-20 18:58:56 +02:00
launcher Merge pull request #392 from OpenMW/master while resolving conflicts 2018-03-09 21:07:46 +02:00
master [General] Use correct versions of C++ per target 2018-02-16 16:31:45 +08:00
mwiniimporter Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
niftest Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
opencs Merge pull request #395 from OpenMW/master while resolving conflicts 2018-03-29 07:28:30 +03:00
openmw Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
openmw-mp Merge pull request #396 from TES3MP/0.6.3 while resolving conflicts 2018-03-30 09:32:43 +03:00
openmw_test_suite Label gtest directories as system 2018-03-13 21:27:14 +03:00
wizard Change default installation directory from 'data' to 'basedata' (Bug #3557) 2018-01-14 00:24:30 +00:00
doc.hpp