Commit Graph

213 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 a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
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
David Cernat 22521578eb
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
7 years ago
scrawl c50b18b3bb
Move PathgridGraph out of CellStore
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.

This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
7 years ago
David Cernat 2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
rexelion f0649849b8 changed variable name to be more descriptive 7 years ago
rexelion 69a56eaea3 don't initialise rangeAttackOfTarget 7 years ago
rexelion 983c33c4c8 don't use a pointer for ActionWeapon 7 years ago
rexelion cab0002461 Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents 7 years ago
David Cernat 721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
7 years ago
Koncord 6222c20e82 [Client] Convert MechanicsHelper to namespace 7 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
Andrei Kortunov 62b24eb078 Combat AI: do not use range weapons under water 7 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 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
David Cernat a4165325fa [Client] Improve synchronization of Actor swings 7 years ago
David Cernat ce9605957a [Client] Use different way of preventing attacks on players in dialogue 7 years ago
David Cernat edb155869b Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
7 years ago
David Cernat 2e8714afaa [Client] Rethink and restructure tes3mp combat code so it works for NPCs 7 years ago
Allofich 5a00b239ac Reduce scope of variables 7 years ago
scrawl 8752ae9c6a Fix include 7 years ago
Allofich 5d2090684a Store mHitAttemptActorId in save files 7 years ago
Allofich 25c64dbb0f Make combat engagement logic more like vanilla
(Fixes #2678, Fixes #3705)
7 years ago
Allofich e10c4d8814 Stop combat between AI when canFight is false 7 years ago
Leon Krieg 739cd5ba45 Fixed more spelling mistakes 8 years ago
Allofich a6dae51d87 Require line of sight for AI attacks (Fixes #3646) 8 years ago
MiroslavR 5e46121046 Implement fleeing AI (Closes #1118) 8 years ago
Martijn Bakker 45ffdbb284 fixed a segmentation fault when entering a cell which contains someone already attacking you 8 years ago
Allofich 04c13ffab3 Add unarmed attack selection to chooseBestAttack() 8 years ago
mrcheko 229cb4b386 remove dynamic_cast to ActionPotion 8 years ago
mrcheko 48765f2ff2 fix using potion as weapon 8 years ago
scrawl 65dc12cdd6 Remove unused parameter 8 years ago
Allofich 3bbde312b9 Remove unneeded code 8 years ago
Allofich c98d4e0473 Allow dodging for bipedal creatures 8 years ago
Allofich 7bc4535c0d Make NPCs dodge according to target's weapon reach 8 years ago
scrawl 05e4542d33 Merge pull request #1048 from mrcheko/pathfinding
Pathfinding unification v2
8 years ago
Allofich 5c2bc515fe Remove overridden code in aicombat 8 years ago
Allofich 0d63d75bb0 Remove no longer used parameter 8 years ago
Allofich 286e4bb98f Remove attacktype movement 8 years ago
Allofich 154dcc942c Let NPCs use attack type regardless of movement 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 e2cd87fcc7 fix veritcal aiming 8 years ago
mrcheko 293a0f768c use real distance to target to determinate 'ready to attack' state 8 years ago
mrcheko 8d4f0660ce fix hardcoded melee attack ranges 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
terrorfisch be25e2ba75 Make NPCs use both hands in weaponless combat. 8 years ago
Allofich b1be3596dc Cleanup of #include statements 8 years ago