Commit Graph

72 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
David Cernat b86155dc11 [Client] Allow AiFollow package to have infinite distance when desired 6 years ago
Andrei Kortunov ee45f54b53 Refactor AiTemporaryStorage usage 6 years ago
Andrei Kortunov fed10e87aa Store integer actor ID in AI packages (bug #4036) 6 years ago
Andrei Kortunov d8d47f081b AiFollow: add a threshold when turning to target 7 years ago
Ewan Higgs 38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 7 years ago
Allofich 6253a5218e Adjust AI follow distances
(Fixes #3225)
7 years ago
Allofich 3897c49e30 Fix loading 0-duration Follow and Escort packages
(Fixes #3755)
7 years ago
Leon Krieg c7b4b2cdd7 Fixed multiple spelling mistakes 8 years ago
Allofich df03b32205 Coverity fixes 8 years ago
mrcheko 612c7f1a2f Revert "Revert "Merge pull request #993 from mrcheko/pathfinding""
This reverts commit 3732979eec.
8 years ago
scrawl 3732979eec Revert "Merge pull request #993 from mrcheko/pathfinding"
This reverts commit 5190275b37, reversing
changes made to d7845012bf.
8 years ago
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
8 years ago
Allofich b1be3596dc Cleanup of #include statements 8 years ago
Allofich 3bebbab78e Duration fixes for Follow and Escort 8 years ago
scrawl c4d38bb42d Fix clang analyzer warnings 8 years ago
scrawl daa94cc50e Fix cppcheck warnings 8 years ago
mrcheko b960b0af93 rewrite pathTo for clearer logic; reapply Scrawl's aifollow threshold 8 years ago
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
8 years ago
scrawl 387624e158 Add a threshold to AiFollow distance
Idle animations can move the actor around slightly, which sometimes causes AiFollow to constantly toggle between "arrived" and "following" state even when the player isn't moving. Could be observed by summoning a bonelord.
9 years ago
scrawl 278076e609 Include cleanup 9 years ago
scrawl b3f5ac5dbb Include cleanup 9 years ago
mrcheko c773ed9f9a move checkWayIsClear to pathfinding; move shortcut logic to separate func (AiPackage::shortcutPath); rework AiPackage::pathTo 9 years ago
scrawl 59db9664ba Pass the CharacterController to AiPackage::execute 9 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 9 years ago
scrawl 7bacb9418d Various math code ported to osg 9 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 9 years ago
scrawl e0c6f84546 AiFollow: target has to be seen in order to start following (Fixes #1637) 10 years ago
scrawl 109a3f78a1 Adjust AiFollow distance for groups of multiple followers (Fixes #1637) 10 years ago
terrorfisch 0871d45790 Draft how to move temporary package state to CharacterController.
Example for a few values shown in AiWander.
10 years ago
scrawl 8ad2b95208 Revert "AiFollow: return from execute() if target is not player"
This reverts commit 061c7813f6.

Fixes #1898.
10 years ago
scrawl 233e221de2 Terminate AI packages when target is disabled or deleted (Fixes #1910) 10 years ago
scrawl 9b38888ac9 Add missing AiFollow ActorId initialization (Fixes #1818) 10 years ago
scrawl 061c7813f6 AiFollow: return from execute() if target is not player (Fixes #1637) 10 years ago
scrawl f8010c09fe Adjust combat engagement of following actors (Fixes #1810) 10 years ago
scrawl d649c19790 Cache ActorId in AiFollow::getTarget (Fixes #1804) 10 years ago
scrawl 22d7d8a466 Implement Command creature/humanoid magic effects (Fixes #1120) 10 years ago
scrawl f67b7dae91 Sheath weapon in all Ai packages except for AiCombat 10 years ago
scrawl d9a6515fe3 Adjust AiFollow running threshold to more closely match vanilla MW 10 years ago
scrawl d81e9cfefd Implement actors fighting for the actor they are following (Fixes #1141) 10 years ago
scrawl a54ac579a5 Savegame: Store AiSequence 10 years ago
scrawl 36d9ae17cc Revert "Change all AI packages (except AiActivate) to use ActorIds"
Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..)

This reverts commit 2e9985c1a3.
10 years ago
scrawl 2e9985c1a3 Change all AI packages (except AiActivate) to use ActorIds
More robust in case the target changes cell or there are multiple targets with the same RefId
10 years ago
Thomas d2aada95b4 Fixed AiPursue by fixing underlying issue is Pathto() 10 years ago
Thomas cbfa282f8d Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work)
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
      - Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
10 years ago
Thomas 2c74ea381e Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue 10 years ago
Thomas e71a119c23 Made aifollowers run when long distances (800 or 10000, depending) from what they're following. 10 years ago
gus d9ea7107b7 compile fix. 10 years ago
gus bee057346b Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
10 years ago
gus d84319300a fix 10 years ago