Commit Graph

279 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
Andrei Kortunov 23d917df9c Do not use magic numbers in capacity calculations 6 years ago
David Cernat 21d5bb4d4e
Merge pull request #460 from OpenMW/master
Add 0.7.0 commits up to 20 Jul 2018
6 years ago
Andrei Kortunov 8281fd903f Set movement speed to 0 when unconscious (bug #4519) 6 years ago
David Cernat c075496748 [General] Replace deathReason in death packets with a killer variable
Add serverside script functions for determining the killers of both players and actors.

Use unsigned ints for script functions returning an object or actor's refNumIndex or mpNum.

Remove updateDeadState() from LocalPlayer and make its code part of updateStatsDynamic() for simplicity.
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
David Cernat 7ffdb18bf9 [General] Implement ActorDeath packet, part 1
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.

A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
6 years ago
Andrei Kortunov b0a140e714 Disable actor collision only after end of death animation 6 years ago
Andrei Kortunov 977a27ecb7 Do not clear corpses until end of death animation (bug #4307) 6 years ago
David Cernat a86c68c5a1 [General] Add sync for ranged weapon & projectile strike enchantments 6 years ago
David Cernat 3f8d94b030 [General] Synchronize strike enchantments in combat 6 years ago
David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
Andrei Kortunov b8fd530ee1 Do not speak with unconscious creatures 7 years ago
scrawl 84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
Andrei Kortunov dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 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
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 1c6e359fe9 [Client] Set and clear hitAttemptActorId for DedicatedPlayers
This allows a DedicatedPlayer's follower NPCs to target enemies attacking the DedicatedPlayer.
7 years ago
David Cernat 809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 7 years ago
David Cernat ea7c3f2dc7 [Client] Make tes3mp combat code work with Creatures, not just NPCs 7 years ago
Andrei Kortunov 14b59e0e4b Vanilla-like tgm (fixes #3798) 7 years ago
Allofich 5282556ae0 Show names on combat actors when RMB GUI is active
Fixes (#3797)
7 years ago
Rafael Moura 05cc69f6f1 Porting more ContainerStoreIterator usage to const version 7 years ago
Allofich 6b53541571 Prevent AI actors from hitting unintended targets
(Fixes #3254)
7 years ago
Allofich e047679595 Fix trying to access stats on non-actors 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
MiroslavR f1f9209814 Creatures now auto-equip shields (Fixes #3704) 7 years ago
Allofich 34851349de Pass hitPosition by const reference 8 years ago
Allofich bce0166931 Don't play blood effects for resisted hits 8 years ago
scrawl a825882c6b Process death events at the end of the death animation (Fixes #1873) 8 years ago
scrawl 8fcc1911d9 Use fCombatDistance as the creature attack range 8 years ago
scrawl c3ef387208 Vanilla-compatible creature/NPC respawning (Fixes #2369, Fixes #2467) 8 years ago
scrawl d05603c7fe Directly apply On Target 'When Strikes' enchantments instead of launching a projectile (Fixes #3212) 8 years ago
scrawl fb219fea17 Fix respawning of NPCs/creatures when they were moved to a different cell 8 years ago
scrawl effe022bb2 Move preload model list to MWClass, preload NPC head/hair 8 years ago
scrawl 32d5dece58 Add count argument to getToolTipInfo 9 years ago
scrawl 0d4729dcd5 Use the const version of CustomData::as* 9 years ago
scrawl b0894ea20d Accept a ConstPtr in hasToolTip 9 years ago
scrawl 04f7a8f8eb Remove redundant getId function 9 years ago
scrawl 303521002d Accept a ConstPtr in adjustScale 9 years ago
scrawl 09bdb0ad4b Accept a ConstPtr in getServices 9 years ago
scrawl 3c98f8dde3 Accept a ConstPtr in isPersistent 9 years ago
scrawl 3fe3091275 Accept a ConstPtr in isEssential 9 years ago
scrawl 4a47fc32fa Accept a ConstPtr in getBloodTexture 9 years ago
scrawl 5b082be79f Accept a ConstPtr in getBaseGold 9 years ago
scrawl da7ebfde99 Accept a ConstPtr in copyToCell 9 years ago