c5ae95aedd
Merge branch 'master' into c++11
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
10 years ago
b3b55a5842
Explicitly instantiate MWWorld::Store
10 years ago
b1cc74dd9a
Explicity instantiate MWMechanics::Stat
10 years ago
f1774ee7c3
Fixed compile failing on OSX and Linux.
10 years ago
52cf8541f5
End point tolerance restored to 64 units.
...
Corrected problem pointed out by Scrawl.
Destination needs tolerance of 64 to avoid overcrowding.
10 years ago
91d1bab4ac
replaced NULL with nullptr
10 years ago
3c76764ef4
replaced auto_ptr with unique_ptr
10 years ago
ff108b4c6b
replaced boost::shared_ptr with std::shared_ptr
10 years ago
3655ef16af
Explicitly instantiate ESM::StatState
10 years ago
40a925ad37
Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726
10 years ago
88f1220a77
Merge remote-tracking branch 'dteviot/Bug2726'
10 years ago
531bca1273
Add a threshold for changing aicombat targets ( Fixes #2755 )
10 years ago
1239667cb4
AiWander uses points between PathGrid points ( Fixes #1317 )
...
When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.
10 years ago
eb2aa965b9
Extracted function SetCurrentNodeToClosestAllowedNode()
10 years ago
0095737c40
Use correct type of variable. Remove unnecessary casts.
10 years ago
f942db2b27
Simplified code.
10 years ago
9a02a85a24
Pulled duplicate code into function.
10 years ago
fae93e3d82
Bugfix: was not resetting mStuckCount.
10 years ago
46a654286b
Remove fix for #1317
...
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
10 years ago
164994f3d3
Made PathFinder::buildPath() private.
...
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
10 years ago
6bcea21e14
Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876 )
10 years ago
a7bd050928
Accurate attack timings in AiCombat
10 years ago
741e5db862
Fix for non-bipedal creatures that use weapons, e.g. rieklings
10 years ago
82740c1645
Remove completely broken code
10 years ago
d07b176b36
Take into account hit recovery, knockdown and other animations for AiCombat attack timing
10 years ago
520a832a9a
Remove an already resolved todo comment
10 years ago
a1432b0255
Move attackingOrSpell flag to the CharacterController
10 years ago
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
59db9664ba
Pass the CharacterController to AiPackage::execute
10 years ago
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
beb1086260
Fix attackStrength being unset for creatures with no weapons
10 years ago
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
10 years ago
6f34a0501a
Attempting to make a potion with no effects removes the ingredients ( Fixes #2722 )
10 years ago
33a3dabc31
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722 )
10 years ago
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
83961e9109
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
10 years ago
2ce269c0fc
Werewolf stats compatibility with old save files
10 years ago
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
10 years ago
c65e7a31e7
Aquatic creatures no longer try to get onto land.
...
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
10 years ago
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
10 years ago
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
10 years ago
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
10 years ago
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
10 years ago
f017fd6860
Reduce includes in animation.hpp
10 years ago
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
520fbd63c4
simplified pathfinding code.
...
remove mIsPathConstructed. Instead call !mPath.empty().
10 years ago
bfff84ba8f
replaced #include with forward class declaration, as suggested by slaugherfish.
10 years ago
Marc Zinnschlag
Alexander "Ace" Olofsson
dteviot
scrawl
dteviot