Commit Graph

266 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
Andrei Kortunov 3d1daaebab Rework manual spellcasting (e.g. via scripts) 6 years ago
David Cernat f3892d697b [Client] Disable clientside locking and unlocking of objects 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 8ce225b1cc [Client] Use the casters of damage-dealing spells as death reasons 6 years ago
Capostrophic 6c23caadd7 Fix crash when a target in a different cell is (un)locked 6 years ago
Capostrophic 0c4fa55f16 Make Open spells casted by anything trigger player crime event (fixes #4461) 6 years ago
Andrei Kortunov fed10e87aa Store integer actor ID in AI packages (bug #4036) 6 years ago
David Cernat a28b27f5d9 Merge pull request #443 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
6 years ago
Andrei Kortunov be394870e4 Fix regressions in spell resistance 6 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
6 years ago
scrawl cfdf99f601
Revert "Merged pull request #1573"
This reverts commit 7324bd368f, reversing
changes made to 810e4416f6.
6 years ago
Marc Zinnschlag 832b4bb778 Merged pull request #1659 6 years ago
David Cernat 74c2a0b311
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
6 years ago
David Cernat 78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 6 years ago
Andrei Kortunov 22fb1f3403 Play spellcasting effects from objects 6 years ago
David Cernat fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
6 years ago
Capostrophic d9acd19dc0
Merge branch 'master' into illusion 6 years ago
scrawl 92d0fb2981
Merge pull request #1667 6 years ago
Capostrophic 77467f17c9
Fix a typo 6 years ago
David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
6 years ago
scrawl c610b8acc8
Merge pull request #1649 6 years ago
scrawl cd9f767e29
Merge pull request #1650 6 years ago
Capostrophic 2dca389a3b Extend magic resistance/weakness to all effects that can be resisted (fixes #4309) 6 years ago
David Cernat ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
6 years ago
Capostrophic 2d119e834a Add vanilla absorb attribute behavior option, on by default (Fixes #4135) 6 years ago
Capostrophic b6a2589e7b Don't apply harmful spell effects on the player in god mode (fixes #4264) 6 years ago
Andrei Kortunov 53ef345680 Update magic effect particles after building new animation (bug #2254) 6 years ago
David Cernat 66078bfea7 [General] Implement Mark location sync as part of PlayerMiscellaneous 6 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
6 years ago
Andrei Kortunov 0e04a26ef6 Set duration of magic effects from ingredients (bug #4261) 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
Grigorii Latyshev 2abb1a2ec2 Added checkMagicka parameter 7 years ago
Grigorii Latyshev 9fe5a4d236 Revert condition changes 7 years ago
Grigorii Latyshev dab72b45db Move mana reducing code back 7 years ago
Grigorii Latyshev ce32462358 Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*) 7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
Andrei Kortunov 30b05b557b ExtraSpell magic effect: a basic implementation 7 years ago
David Cernat ddf0dfed55 Merge pull request #298 from OpenMW/master
Add OpenMW commits up to 26 Sep 2017
7 years ago
MiroslavR f15de6d3ca ESS-Importer: Convert magic projectiles (Closes #2320) 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 1e983604db Dispel only effects from spells (bug #3995) 7 years ago
Andrei Kortunov ab391f17db Fixes regression in spell school detection (bug #4007) 7 years ago
David Cernat 77ce05b7d6 [Client] Fix spell casting probability synchronization 7 years ago
David Cernat 721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
7 years ago
Andrei Kortunov b7cfb1aaf4 Fixed DamageHealth and AbsorbHealth effects applying 7 years ago
Andrei Kortunov 3ba0a336b7 Move spell magicka cost calculation to standalone function 7 years ago
David Cernat 0b68e59060 [Client] Send ObjectLock packets when using lock spells 7 years ago
Koncord 6222c20e82 [Client] Convert MechanicsHelper to namespace 7 years ago