1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 09:23:52 +00:00
openmw/apps
mrcheko d7d5cc6689 Merge remote-tracking branch 'upstream/master' into pathfinding
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aifollow.cpp
	apps/openmw/mwmechanics/aipackage.cpp
	apps/openmw/mwmechanics/aipackage.hpp
	apps/openmw/mwmechanics/aiwander.cpp
	apps/openmw/mwmechanics/pathfinding.hpp

Ogre::Vector3->osg::Vec3f; REACTION_INTERVAL->AI_REACTION_TIME; MakeOgreVec3->MakeOsgVec3
2015-12-29 19:15:40 +03:00
..
bsatool Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-13 21:11:24 +02:00
esmtool esmtool fix 2015-11-14 00:27:59 +01:00
essimporter Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
launcher Launcher: ensure to clear previous settings when reloading settings 2015-11-27 20:52:29 +01:00
mwiniimporter Merge remote-tracking branch 'scrawl/werewolf' 2015-12-08 09:28:35 +01:00
niftest Removed now unneeded script 2015-08-07 20:53:43 -04:00
opencs Merge branch 'drop' 2015-12-20 10:18:05 +01:00
openmw Merge remote-tracking branch 'upstream/master' into pathfinding 2015-12-29 19:15:40 +03:00
openmw_test_suite Adjust tests to work with esm_rewrite branch. 2015-11-14 00:27:59 +01:00
wizard InstallationPage: properly exit the QThread (Fixes #2210) 2015-12-08 21:41:35 +01:00
doc.hpp