mrcheko d2fe6fe857 Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding ...

# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/aicombat.hpp
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
#	apps/openmw/mwmechanics/aiwander.cpp
#	apps/openmw/mwmechanics/aiwander.hpp

2016-07-09 22:59:54 +03:00

..

bsatool

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-13 21:11:24 +02:00

esmtool

Rewrite NAME_T into FIXED_STRING.

2016-05-07 23:27:33 +03:00

essimporter

Implement effect removal for abilities (Fixes #3455)

2016-07-01 18:50:28 +02:00

launcher

Merge branch 'appveyor' of github.com:ace13/openmw into appveyor

2016-01-19 22:11:46 +01:00

mwiniimporter

Fix cppcheck warnings

2016-01-03 20:19:38 +01:00

niftest

Removed now unneeded script

2015-08-07 20:53:43 -04:00

opencs

Replace "sys::default" with ESM::CellId::sDefaultWorldspace

2016-07-02 19:48:11 +02:00

openmw

Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding

2016-07-09 22:59:54 +03:00

openmw_test_suite

Add unit tests for ESM::FIXED_STRING

2016-05-07 23:27:33 +03:00

wizard

Rewrites FindLIBUNSHIELD using LibFindMacros

2016-06-12 14:44:04 +03:00

doc.hpp

…