Commit Graph

202 Commits (ee3aba149d55f2294adccd1b99cfa36f6beeb7dd)

Author SHA1 Message Date
scrawl d25b3ad9cb Fix AiCombat for creatures with weapons 11 years ago
scrawl 5ee105c812 Fix typo 11 years ago
scrawl 067c2bc2ec Disable combat movements for creatures without weapons 11 years ago
scrawl 39d86a9468 Improvements to smooth NPC steering 11 years ago
mrcheko 3a5da7e6e8 merged with master 11 years ago
Marc Zinnschlag fd5486864a Merge remote-tracking branch 'gus/AIFix2'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
11 years ago
mrcheko fe0268062d merge with master 11 years ago
mrcheko 45b3aa3d93 corrected things connected to determining attack type 11 years ago
scrawl b1066de81d Revert "Merge remote-tracking branch 'mrcheko/master'"
This reverts commit 4e360136b1, reversing
changes made to 047bbe43b2.

Conflicts:

	apps/openmw/mwmechanics/aicombat.cpp
11 years ago
scrawl a1fbd1fcc8 Revert "Merge remote-tracking branch 'mrcheko/master'"
This reverts commit df7c139e2f, reversing
changes made to fec26342cd.
11 years ago
gus 707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
11 years ago
gus 5ca5946760 WIP 11 years ago
mrcheko 87e83a92f8 refactoring of setting an attack type 11 years ago
scrawl ea21d8fec3 Fix CreatureTargetted function 11 years ago
scrawl c8a9e9f7fa Stop AiCombat when the target is dead 11 years ago
scrawl df7c139e2f Merge remote-tracking branch 'mrcheko/master' 11 years ago
mrcheko 339399f8b1 bug fix/logic fix/future suggestion 11 years ago
scrawl 9723263730 Bug #1126: Tweak creature attack distance a bit (still no idea where this should come from) 11 years ago
scrawl 4e360136b1 Merge remote-tracking branch 'mrcheko/master'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
11 years ago
scrawl 13646a651b Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats. 11 years ago
mrcheko df4df5b094 fixed weapRange for creatures/startcombat script(?) 11 years ago
mrcheko 435bbdd530 one more mismatch fixed 11 years ago
mrcheko 46a4790cb1 final warnings removal 11 years ago
mrcheko 7df8273d71 fix for everybody 11 years ago
mrcheko 5357f569e6 fix for scrawl 11 years ago
mrcheko f2ad1c18f2 fix merging problem/some logic fixes 11 years ago
mrcheko d5f794d4fb update to combat ai behaviour 11 years ago
scrawl da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 11 years ago
Marc Zinnschlag 3e58eb34e4 Merge remote-tracking branch 'sergeyshambir/startcombat'
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
11 years ago
gus 5d4e148063 some clean up 11 years ago
gus 5d038423ec attempt to solve Bug #1009 by not building graph every frame 11 years ago
gus 2d66b2c4fa AiFollow. Npc get stuck often (no stuck dtection yet) 11 years ago
gus f41f08c352 Wrong logic... should improve performances 11 years ago
scrawl 621e52f09d Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds. 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl 90b55c8d4b Use Ogre's asin/acos functions which will protect against NaNs 11 years ago
Sergey Shambir 5c7e39a92f Implemented script commands StartCombat, StopCombat, GetTarget.
Also renamed one field of AIWander class because it's not longer
unknown.
11 years ago
scrawl b22dd40b41 Implement Paralyze magic effect 11 years ago
gus 4559e932ae AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState 11 years ago
gus 683b8d77dd build fix (thanks travis) 11 years ago
gus 02ded18fc5 Linux backslash fix 11 years ago
gus 2a927f65d3 perfomances optimisations (pathfinding is computed less often, max 4 times per sec) 11 years ago
gus 650a112e2e better timer 11 years ago
gus 0e86209224 linux fix :p 11 years ago
gus b7a9243173 fighting should stop when the target is dead 11 years ago
gus 12d8b4e0f8 bugfix 11 years ago
gus 2d84f7d33d NPC run 11 years ago
gus 968968502e NPC always face you when fighting 11 years ago
gus 1ac3d99c78 pathfinding now works in AICombat. 11 years ago
gus 83a375b55d AI now continue to hit you.
TODO: change the way time is handled
11 years ago
gus 2537384c50 bug fix 11 years ago
gus 9353f4d14f WIP AI combat 11 years ago