mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 11:26:38 +00:00
Code Issues Releases Wiki Activity
11741 commits 115 branches 76 tags 128 MiB
Commit graph

56 commits

Author SHA1 Message Date
scrawl
e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950) 
Don't consider actors as followers if they are also in combat with the follow target
 2014-09-26 22:08:07 +02:00
scrawl
282c93ccc5 Handle death in actor update rather than instantly (Fixes #1866) 2014-09-05 17:17:45 +02:00
scrawl
639ae7e06c Implement friendly hits on followers (Fixes #1139) 2014-08-03 16:24:16 +02:00
scrawl
c0645d4978 Increase death count immediately on death (Bug #1588) 
This is required for scripts using getDeadCount as reaction to onDeath that rely on the increased value.
 2014-07-21 20:37:14 +02:00
scrawl
a3ea7cb956 Ignore distance when considering aggression due to crime (seems to work better, all balmora mages guild members now come to help when one is attacked) 2014-06-18 16:57:53 +02:00
scrawl
ffb6f5d555 Use fFight<Crime> GMSTs to control attacks in response to crimes 2014-06-17 04:05:27 +02:00
scrawl
28feb260eb Implement disposition/distance based aggression (Fixes #1520) 2014-06-16 20:05:53 +02:00
scrawl
e458cf1df2 Savegame: Store death counter (Fixes #1477) 2014-06-13 02:26: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
Marc Zinnschlag
c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
 2014-04-25 15:29:23 +02:00
Thomas
f3272c941f Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. 
The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.
 2014-04-24 22:47:45 -04:00
Jeffrey Haines
42b879a9a5 Reworked the accusation of actors 2014-04-24 22:41:05 -04:00
Jeffrey Haines
c3e08916da Sneak: Added support for state checking 
I need advice one what I should do in order to pass mActors over to the
player. Particularly line 139 in player.cpp
 2014-04-24 20:40:17 -04:00
Jeffrey Haines
8ce938c6f1 Revert 6b28c06..98fd381 
This rolls back to commit 6b28c06b2c.
 2014-03-29 22:26:53 -04:00
Jeffrey Haines
6c866deb1b Feature #1154 Not all NPCs get aggressive when one is attacked 
Partially implemented
 2014-03-29 21:23:34 -04:00
scrawl
793649c854 ToggleAI: Report current status on toggle 2014-03-26 19:55:52 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
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
 2014-01-28 12:33:31 +01:00
gus
707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
 2014-01-24 19:16:50 +01:00
scrawl
03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-24 18:28:35 +01:00
scrawl
205e8aa4e9 Feature #957: Implement area magic 2014-01-20 13:11:29 +01:00
scrawl
95651857f3 Fix code duplication 2014-01-14 02:52:34 +01:00
scrawl
0d0005c433 Fix fatigue not restoring when waiting 2014-01-14 02:20:13 +01:00
gus
dd870e35db get all actors following a given actor 2014-01-12 14:02:15 +01:00
scrawl
3bf36515d5 Implement Trespassing crime 2014-01-10 21:26:24 +01:00
scrawl
7b33f6f2ac Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this. 2014-01-08 17:19:43 +01:00
scrawl
3c0080d2c1 Implement theft detection 2014-01-07 19:58:17 +01:00
scrawl
29c823b9d4 Implement awareness check function. Use this for combat AI and GetDetected instruction. 2014-01-07 00:51:09 +01:00
Marc Zinnschlag
1c13a9037a save and load dynamic records 2013-12-07 13:17:28 +01:00
Marc Zinnschlag
8190fdb16c Merge remote-tracking branch 'scrawl/master' 2013-11-19 16:56:18 +01:00
scrawl
e8dcd74741 Recharge enchanted items in player's inventory over time 2013-11-19 16:42:24 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2013-11-19 09:10:48 +01:00
gus
dff3cf162d ToggleAI script instruction 2013-11-18 23:03:44 +01:00
scrawl
0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 2013-11-17 23:31:08 +01:00
Torben Carrington
c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 2013-05-24 20:10:07 -07:00
Chris Robinson
274f3c7b77 Force character state to update after switching view modes 2013-04-25 07:08:11 -07:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
scrawl
1666bc7740 Armor rating 2013-03-16 22:53:33 +01:00
Chris Robinson
48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 2013-02-25 09:57:34 -08:00
Chris Robinson
fdabef65a1 Use a method to update an object's cell in the mechanics manager 
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
 2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c Use a separate class to handle activator mechanics 2013-01-28 23:39:11 -08:00
Chris Robinson
d2f5a886c7 Handle playgroup and skipanim through mwmechanics 2013-01-16 17:53:18 -08:00
Chris Robinson
c1b32d6006 Remove outdated comments 2013-01-16 08:24:20 -08:00
Chris Robinson
3c02e1ccc9 Run physics right after updating the actors 2013-01-16 08:22:38 -08:00
Marc Zinnschlag
0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 2012-11-10 14:59:52 +01:00
Marc Zinnschlag
d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 2012-11-10 12:36:01 +01:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
scrawl
33b4b29fbc persuasion mechanics, added reputation 2012-11-10 00:29:36 +01:00
scrawl
ace9ee9c83 persuasion dialog 2012-11-09 20:18:38 +01:00
scrawl
d53a7ade1e method names, disposition uint->int 2012-11-09 14:42:09 +01:00