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.

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
..
browser	[Browser] Cast QStrings to UTF-8 instead Latin1	7 years ago
bsatool	Restore trailing new lines to shrink PR	7 years ago
esmtool	Restore trailing new lines to shrink PR	7 years ago
essimporter	ESS-Importer: Convert magic projectiles (Closes #2320)	7 years ago
launcher	Merge pull request #383 from OpenMW/master	7 years ago
master	Remove some duplication, standardize sol2 header inclusion	7 years ago
mwiniimporter	Restore trailing new lines to shrink PR	7 years ago
niftest	Restore trailing new lines to shrink PR	7 years ago
opencs	Merge pull request #361 from OpenMW/master while resolving conflicts	7 years ago
openmw	Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts	7 years ago
openmw-mp	Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts	7 years ago
openmw_test_suite	Move new behaviour into macro to reduce code duplication	7 years ago
wizard	Change default installation directory from 'data' to 'basedata' (Bug #3557)	7 years ago
doc.hpp	…