mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 03:15:32 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps
History
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
2018-02-12 06:50:52 +02:00
..
browser [Browser] Cast QStrings to UTF-8 instead Latin1 2018-01-11 20:35:13 +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 #383 from OpenMW/master 2018-02-11 06:57:54 +02:00
master Remove some duplication, standardize sol2 header inclusion 2018-01-05 20:25:57 -05: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 #361 from OpenMW/master while resolving conflicts 2017-12-25 07:37:54 +02:00
openmw Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
openmw-mp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
openmw_test_suite Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
wizard Change default installation directory from 'data' to 'basedata' (Bug #3557) 2018-01-14 00:24:30 +00:00
doc.hpp