scrawl
386604bc9d
Fixes #869 : Added methods to control external and internal collision modes separately
...
When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied.
Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.
2014-05-13 01:43:52 +02:00
mrcheko
725f6cac5e
AiPursue infinite package updating bug resolved
2014-05-13 00:05:30 +04:00
scrawl
6cc691115b
Savegame: store most of CreatureStats
2014-05-12 21:37:36 +02:00
Thomas
645d174a96
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aisequence.hpp
2014-05-12 14:49:08 -04:00
mrcheko
e4fe78937a
Merge remote-tracking branch 'upstream/master'
2014-05-12 22:06:26 +04:00
scrawl
b0fbea9d57
Removed a wrong assertion. Max drowning time is defined by GMST.
2014-05-11 21:03:27 +02:00
Marc Zinnschlag
2009cf9ad7
Merge remote-tracking branch 'scrawl/master' into openmw-30
2014-05-10 10:48:40 +02:00
scrawl
1444cd9051
Fix AiCombat exception when actor has a lockpick/probe equipped.
...
Don't make NPCs autoEquip lockpicks/probes, since they can't use them.
2014-05-10 00:37:36 +02:00
scrawl
731bc9c275
Fix broken isClass check and renamed variable for clarity
2014-05-09 18:45:49 +02:00
slothlife
46eb20b98c
Fixes for warnings when building with MSVC
...
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
cc9cii
cf23721f1b
Windows debug build crash fix.
2014-05-09 20:43:24 +10:00
mrcheko
01810f24b0
A* misses 1st closest node fix
2014-05-06 23:29:39 +04:00
Marc Zinnschlag
729e079b0b
Merge remote-tracking branch 'scrawl/master'
2014-05-06 20:18:19 +02:00
scrawl
1c8c26072d
Crime and self defense fixes
...
- NPCs should still shout messages such as "thief" even if they did not report the crime
- Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor)
- Fixed self defense for creatures (Fixes #1203 )
2014-05-06 19:15:43 +02:00
scrawl
d2beb814e7
Remove superfluous attack phrases (already done by startCombat)
2014-05-06 18:05:53 +02:00
scrawl
dd9117809d
Say an attack phrase when combat starts
...
Move combat start to a helper method
Added some todo comments
2014-05-06 00:13:31 +02:00
Jeffrey Haines
d4812c3af9
fixed placement of else statement
2014-05-04 17:54:33 -04:00
Jeffrey Haines
78f76842a6
Added else statement
...
Its still dodgy though
2014-05-04 16:56:30 -04:00
Jeffrey Haines
7d5dab214c
#58 - Sneak Skill: functional sneaking
...
Removed sneak checking from individual actor update.
Added sneak checking to Actors::update()
2014-05-04 16:20:09 -04:00
Jeffrey Haines
a65e8393bb
Merged files
2014-05-04 11:33:27 -04:00
mrcheko
f596b698d9
fixes to slow-down at jump startup and infinite air intertia growth
2014-05-04 18:15:07 +04:00
Jeffrey Haines
a469444e53
Player can't detect self
2014-05-04 08:05:32 -04:00
Thomas
dbf06d8c8b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/aipursue.hpp
apps/openmw/mwmechanics/aisequence.hpp
2014-05-04 02:06:43 -04:00
Jeffrey Haines
e1e23447f2
Removed initial check form setSneak
...
It wasn’t needed.
2014-05-03 13:16:07 -04:00
Jeffrey Haines
05e326bdc3
Added update sneak to actors
...
Intends to check the state of a players sneak by asking the question if
each npc can see the player.
2014-05-03 12:48:07 -04:00
scrawl
658c37a299
AiPursue: If we reached the path end, that does not mean we reached the target. Rebuild the path if the target has moved in the meantime.
...
Fixes guards in pursuit activating the dialogue too early.
Also tweaked the activation distance.
2014-05-03 17:17:00 +02:00
scrawl
7bddfc0025
Fix some spelling mistakes.
2014-05-03 12:23:22 +02:00
scrawl
122e606e30
Crime: improvement to arrest on sight for large bounties
...
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
2014-05-03 12:17:44 +02:00
scrawl
fc7e79027a
Fixes #1144 : Don't refreshCurrentAnims when adding already dead actors
2014-05-01 16:55:16 +02:00
mrcheko
9e79fb5b87
fix to broken aiwander logic
2014-05-01 11:41:25 +04:00
mrcheko
e8f7d12c01
uninit bool and invalid iterator bugs fixes
2014-04-30 23:57:19 +04:00
Jeffrey Haines
14ebd8b110
Fixed logic in commit crime
2014-04-30 07:44:29 -04:00
Thomas
10a5bb9464
Made code a bit more standardized and added a good bit of documentation.
2014-04-29 23:40:59 -04:00
Marc Zinnschlag
0c2843b0f7
some missing cleanup
2014-04-29 19:56:33 +02:00
Marc Zinnschlag
f6a876bc3d
added actor ID
2014-04-29 15:27:49 +02:00
Marc Zinnschlag
4eeed4e2c7
Merge remote-tracking branch 'scrawl/return'
2014-04-29 12:27:27 +02:00
scrawl
28ef236f0e
Don't allow setting a new return position if there already is one and we haven't reached it yet
2014-04-29 11:17:07 +02:00
Marc Zinnschlag
8fea2cfa2a
Merge remote-tracking branch 'mrcheko/master'
2014-04-29 10:03:29 +02:00
scrawl
1fd7a07b5e
Merge branch 'master' of https://github.com/OpenMW/openmw into return
...
Conflicts:
apps/openmw/mwmechanics/aisequence.cpp
apps/openmw/mwmechanics/aiwander.cpp
2014-04-29 09:14:13 +02:00
scrawl
9b36a13821
Feature #1289 : NPCs return to default position
...
Make stationary NPCs return to their previous position once combat/crime AI finishes.
2014-04-29 09:09:51 +02:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
Marc Zinnschlag
421679b319
Merge remote-tracking branch 'scrawl/master'
2014-04-28 15:13:09 +02:00
mrcheko
35c1724d39
unblock vertical aiming for combatants
2014-04-28 16:34:49 +04:00
scrawl
0796815da0
Ignore dead actors in getActorsFollowing/Fighting
...
Prevents dead enemies from disallowing resting near them
2014-04-28 11:44:56 +02:00
Marc Zinnschlag
0b2371a05d
Merge remote-tracking branch 'thoronador/fix-minor-stuff'
2014-04-28 10:59:34 +02:00
Marc Zinnschlag
af322a9f77
Merge remote-tracking branch 'scrawl/master'
2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7
Remove unused variable
2014-04-28 10:26:24 +02:00
Thomas
dc54bd5a5f
Merge remote-tracking branch 'upstream/master'
2014-04-27 20:56:45 -04:00
Thomas
c2127845af
Added onKnockdown command
2014-04-27 20:54:22 -04:00
mrcheko
22cdb166f2
warning fix, vars renaming
2014-04-27 22:38:04 +04:00
