Commit Graph

105 Commits (ee3aba149d55f2294adccd1b99cfa36f6beeb7dd)

Author SHA1 Message Date
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) 11 years ago
scrawl ffb6f5d555 Use fFight<Crime> GMSTs to control attacks in response to crimes 11 years ago
scrawl 28feb260eb Implement disposition/distance based aggression (Fixes #1520) 11 years ago
scrawl f935cfc6c9 Fix crash when stealing items with the owner not around (Fixes #1512) 11 years ago
scrawl e458cf1df2 Savegame: Store death counter (Fixes #1477) 11 years ago
scrawl dd9117809d Say an attack phrase when combat starts
Move combat start to a helper method

Added some todo comments
11 years ago
Marc Zinnschlag c63d6437c0 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
11 years ago
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.
11 years ago
Jeffrey Haines 42b879a9a5 Reworked the accusation of actors 11 years ago
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
11 years ago
Jeffrey Haines 8ce938c6f1 Revert 6b28c06..98fd381
This rolls back to commit 6b28c06b2c.
11 years ago
Jeffrey Haines 6c866deb1b Feature #1154 Not all NPCs get aggressive when one is attacked
Partially implemented
11 years ago
scrawl 793649c854 ToggleAI: Report current status on toggle 11 years ago
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
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
gus 707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
11 years ago
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
11 years ago
scrawl 205e8aa4e9 Feature #957: Implement area magic 11 years ago
scrawl 95651857f3 Fix code duplication 11 years ago
scrawl 0d0005c433 Fix fatigue not restoring when waiting 11 years ago
gus dd870e35db get all actors following a given actor 11 years ago
scrawl 3bf36515d5 Implement Trespassing crime 11 years ago
scrawl 7b33f6f2ac Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this. 11 years ago
scrawl 3c0080d2c1 Implement theft detection 11 years ago
scrawl 29c823b9d4 Implement awareness check function. Use this for combat AI and GetDetected instruction. 11 years ago
Marc Zinnschlag 1c13a9037a save and load dynamic records 11 years ago
Marc Zinnschlag 8190fdb16c Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl e8dcd74741 Recharge enchanted items in player's inventory over time 11 years ago
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
11 years ago
gus dff3cf162d ToggleAI script instruction 11 years ago
scrawl 0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 11 years ago
scrawl 992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 11 years ago
Chris Robinson 281fdbd81b Cleanup some redundancy 12 years ago
Torben Carrington c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 12 years ago
Chris Robinson 274f3c7b77 Force character state to update after switching view modes 12 years ago
Chris Robinson 04aeb3dd07 Rename Mechanics' Activators to Objects 12 years ago
Chris Robinson 48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 12 years ago
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.
12 years ago
Chris Robinson 8d98f3649c Use a separate class to handle activator mechanics 12 years ago
Chris Robinson d2f5a886c7 Handle playgroup and skipanim through mwmechanics 12 years ago
Chris Robinson c1b32d6006 Remove outdated comments 12 years ago
Chris Robinson 3c02e1ccc9 Run physics right after updating the actors 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
Marc Zinnschlag 0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 12 years ago
Marc Zinnschlag d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
scrawl ace9ee9c83 persuasion dialog 12 years ago
scrawl d53a7ade1e method names, disposition uint->int 12 years ago
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
12 years ago
gugus f72f898bd9 implement barterOffer. It's used for travel only.
I've started to implement disposition, but it's very basic for now.
12 years ago
Marc Zinnschlag 453f347ee8 Issue #68: added getdeadcount script function 12 years ago
Marc Zinnschlag f2e25b8a47 Issue #68: Keep dead actors out of the actor list for the current scene 12 years ago
scrawl 872fcf3e3d sleeping restoration of health, magicka, and fatigue 12 years ago
Marc Zinnschlag b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 13 years ago