Commit Graph

520 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 18a2d238ab [Client] Don't pop up dialogue screen when an NPC activates another NPC 6 years ago
David Cernat 4ef2aff11e [Client] Remove "Not implemented" message when activating other player
Serverside scripts can now make lots of different things happen as the result of such activation, which is why the message was no longer current.
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
Capostrophic 6e9c08083d
Add missing empty attacker checks 6 years ago
Capostrophic bccba24c40 Make unarmed creature attacks not affect armor condition (fixes #2455) 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 74c2a0b311
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
6 years ago
Capostrophic 1c9fba9a8c Fix jumping encumbrance calculation 6 years ago
David Cernat 5458e09c8a
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
6 years ago
Alf Henrik Sauge feeee50a88 Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
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 b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
6 years ago
Harald H d3b623b5d3 http to https for supported urls (#1625)
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
6 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
6 years ago
Andrei Kortunov 744859f327 Take in account armor condition in the armor rating calculation (bug #4246) 7 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
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 3f159960b7 Restored pickpocket and werewolf check 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 c6aee3b780 [Client] Fix build by changing boost::shared_ptr into std::shared_ptr 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 4d81455020 [General] Rework and simplify death reasons so they work with NPCs 7 years ago
David Cernat 809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 7 years ago
David Cernat 2e8714afaa [Client] Rethink and restructure tes3mp combat code so it works for NPCs 7 years ago
David Cernat 014ff7a059 [Client] Replace usage of Networking::isDedicatedPlayer() 7 years ago
David Cernat 07c2d4251e [Client] Add and use mwmp::PlayerList::isDedicatedPlayer() 7 years ago
David Cernat 0aaf68c994 [Client] Rename mwmp::Players into mwmp::PlayerList for clarity 7 years ago
David Cernat a650683bae [General] Add and use Target struct in mwmp::Attack 7 years ago
David Cernat 9882ceedf3 [General] Remove attackerGuid from mwmp::Attack because it is redundant 7 years ago
David Cernat caf5428532 [General] Rename mwmp::Attack vars in preparation for Actor support 7 years ago
David Cernat 2565816b22 [Client] Delimit and clarify combat changes made by tes3mp
Additionally, revert unneeded small changes to the formatting of OpenMW code
7 years ago
David Cernat 678edffb5a [Client] Rename updateDynamicStats() into updateStatsDynamic() 7 years ago
David Cernat c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
Andrei Kortunov 14b59e0e4b Vanilla-like tgm (fixes #3798) 7 years ago
David Cernat c10dd1b002 Merge pull request #188 from OpenMW/master
Add OpenMW commits up to 24 Mar 2017
7 years ago
Allofich 5282556ae0 Show names on combat actors when RMB GUI is active
Fixes (#3797)
7 years ago
David Cernat a2ef39c655 Merge pull request #178 from OpenMW/master
Add OpenMW commits up to 2 Mar 2017
7 years ago