Commit Graph

103 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 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
Andrei Kortunov 9fd2d57b86 Move previous items to player 6 years ago
Andrei Kortunov f977c6876f Bound items: store item ID instead of pointer 6 years ago
Andrei Kortunov 4de9d9fa77 Split adjustBoundItem() 6 years ago
Andrei Kortunov d1b1cb748d Reequip previous item only if the expired bound item was equipped 6 years ago
Andrei Kortunov 9b72a6ac69 Use the MWWorld::Ptr() instead of string ID 6 years ago
Andrei Kortunov 0375bedab2 Equip previous item after a bound item expires (bug #2326) 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
Nelsson Huotari 63e34a5575 Typofix: updateCrimePersuit -> ...Pursuit 6 years ago
Andrei Kortunov a0a30cdbf5 AI: hide torches during bad weather (bug #4334) 6 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
David Cernat 22521578eb
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
7 years ago
Andrei Kortunov b9d9660efd Update music state in the menu mode (bug #3664) 7 years ago
Andrei Kortunov 9943bd4d74 AiWander fast forwarding improvements (bug #3638) 7 years ago
David Cernat 7f0ea7d01f Merge pull request #294 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/character.cpp
7 years ago
Andrei Kortunov 65d8e2ff5d Allow to use GetDetected without a reference (bug #3110) 7 years ago
David Cernat b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
7 years ago
Andrei Kortunov a5b01fefec Allow to interrupt an attack, if attack button is held 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
scrawl dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes
Do not allow player to change weapon/spell during attack or spellcast
7 years ago
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
scrawl 2611377081 Merge pull request #1350 from akortunov/deathanimationfix
Do not allow to loot fighting actors during death animation (bug #3528)
7 years ago
Andrei Kortunov 641a6cd842 Added a delay before summoned creature corpse despawning 7 years ago
Andrei Kortunov bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 7 years ago
David Cernat 70d9374a6a [General] Implement PlayerKillCount packets 7 years ago
Allofich 6272e1c674 Cache allies found while iterating engageCombat
(Fixes #3814)
7 years ago
NeveHanter 8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 8 years ago
MiroslavR b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 8 years ago
MiroslavR 80f2ae0ca7 Apply magic effects while waiting/sleeping 8 years ago
Allofich b1be3596dc Cleanup of #include statements 8 years ago
scrawl 4acfe1a7e4 Move cleanupSummonedCreature to the mechanics manager (Bug #3439) 8 years ago
scrawl 910ad76e29 Remove spell effects when a summoned creature expires (Bug #3439) 8 years ago
scrawl f417d7780a Fix the enemy nearby check (Bug #3423) 8 years ago
scrawl 53f4b92426 AiEscort do not follow target through doors
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
9 years ago
scrawl 965bea45c0 AiEscort makes the actor side with target in fights (Bug #2697)
Also will follow the player through teleport doors.
9 years ago
Arthur Moore 5e6fcc2aef Alert the user if attempting to play an animation fails
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
9 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 9 years ago
scrawl de8e5f0db1 Restore projectiles 9 years ago
scrawl 0c6e2170db Include cleanup 9 years ago
scrawl c883a73d30 Several warning fixes 9 years ago
scrawl a8ae0dec52 Implement AiWander fast-forward (Feature #1125) 10 years ago
scrawl edc128572d Add MWMechanics::Actor class for temporary actor state, move AiState there 10 years ago
scrawl d962f0918d Implement NPC head tracking (Fixes #1720) 10 years ago
scrawl d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785)
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
10 years ago
scrawl 109a3f78a1 Adjust AiFollow distance for groups of multiple followers (Fixes #1637) 10 years ago
MiroslavR b8d5a9486a Make Restore/Damage Attribute/Skill effects continuous 10 years ago
scrawl 282c93ccc5 Handle death in actor update rather than instantly (Fixes #1866) 10 years ago
scrawl 084cc857d4 Update magic effects when changing equipment (Fixes #1646) 10 years ago