dteviot
f942db2b27
Simplified code.
2015-07-05 18:08:09 +12:00
dteviot
9a02a85a24
Pulled duplicate code into function.
2015-07-05 18:07:14 +12:00
dteviot
fae93e3d82
Bugfix: was not resetting mStuckCount.
2015-07-04 19:00:27 +12:00
dteviot
46a654286b
Remove fix for #1317
...
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
2015-07-04 18:57:56 +12:00
dteviot
164994f3d3
Made PathFinder::buildPath() private.
...
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
2015-07-04 18:47:26 +12:00
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
2015-07-02 19:14:28 +02:00
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
2015-06-28 00:38:39 +02:00
scrawl
59db9664ba
Pass the CharacterController to AiPackage::execute
2015-06-26 17:47:04 +02:00
scrawl
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.
2015-06-26 05:15:07 +02:00
scrawl
beb1086260
Fix attackStrength being unset for creatures with no weapons
2015-06-26 04:21:10 +02:00
scrawl
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
2015-06-26 02:32:41 +02:00
scrawl
6f34a0501a
Attempting to make a potion with no effects removes the ingredients ( Fixes #2722 )
2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31
An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722 )
2015-06-24 05:17:45 +02:00
scrawl
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
2015-06-22 20:09:02 +02:00
Marc Zinnschlag
83961e9109
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-22 15:20:58 +02:00
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
2015-06-21 18:45:49 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
dteviot
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.
2015-06-21 16:23:40 +12:00
scrawl
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
2015-06-18 15:00:21 +02:00
scrawl
6e5f3339ad
Make sure to play IdleSwim when the character is swimming (Bug #2696 )
2015-06-17 20:49:01 +02:00
Marc Zinnschlag
5a5c2bb5bc
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-17 15:56:01 +02:00
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
2015-06-16 19:53:41 +02:00
scrawl
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.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
f017fd6860
Reduce includes in animation.hpp
2015-06-14 23:13:26 +02:00
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
2015-06-14 16:32:13 +02:00
dteviot
520fbd63c4
simplified pathfinding code.
...
remove mIsPathConstructed. Instead call !mPath.empty().
2015-06-14 15:14:02 +12:00
dteviot
bfff84ba8f
replaced #include with forward class declaration, as suggested by slaugherfish.
2015-06-14 10:30:55 +12:00
scrawl
d4c45efb2b
Remove useless #undef's for windows now that we have NOMINMAX flag
2015-06-12 04:39:44 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
2015-06-11 18:28:31 +12:00
scrawl
4c09ecef72
Normalize fixes
2015-06-05 03:41:10 +02:00
scrawl
a0b0ae9bd1
Remove an unused variable
2015-06-04 21:51:24 +02:00
scrawl
78ac37b52a
Remove BOOST_STATIC_ASSERT to fix clang warnings
2015-06-04 20:11:40 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
b70383d127
Remove last remains of Ogre math
2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0
Remove dependency on Ogre::StringConverter
2015-06-03 19:59:54 +02:00
scrawl
7bacb9418d
Various math code ported to osg
2015-06-03 19:41:19 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
58ebf57154
Apply a comment that got lost in the endless depths of my git stash
2015-06-02 17:13:30 +02:00
scrawl
de8e5f0db1
Restore projectiles
2015-06-01 21:41:13 +02:00
scrawl
ccd95419e5
Restore various raycasting
2015-06-01 01:57:15 +02:00
scrawl
71bafcb52b
Restore head tracking
2015-05-31 18:04:14 +02:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
a066b24303
Restore WeaponAnimation
2015-05-31 01:07:43 +02:00
scrawl
988a9cad58
getHitContact Head exception fix
2015-05-30 01:41:38 +02:00
scrawl
fd50be0fb8
Restore various gameplay
2015-05-30 01:00:24 +02:00
scrawl
af2f26d04d
Particle fixes
2015-05-29 20:45:27 +02:00
scrawl
f4ee805e3b
Object animation fix
2015-05-28 15:44:58 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
