Marc Zinnschlag
c5ae95aedd
Merge branch 'master' into c++11
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
dteviot
f1774ee7c3
Fixed compile failing on OSX and Linux.
10 years ago
dteviot
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
Marc Zinnschlag
91d1bab4ac
replaced NULL with nullptr
10 years ago
Marc Zinnschlag
3c76764ef4
replaced auto_ptr with unique_ptr
10 years ago
dteviot
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
dteviot
eb2aa965b9
Extracted function SetCurrentNodeToClosestAllowedNode()
10 years ago
dteviot
f942db2b27
Simplified code.
10 years ago
dteviot
9a02a85a24
Pulled duplicate code into function.
10 years ago
dteviot
fae93e3d82
Bugfix: was not resetting mStuckCount.
10 years ago
dteviot
46a654286b
Remove fix for #1317
...
Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.
10 years ago
dteviot
164994f3d3
Made PathFinder::buildPath() private.
...
Now all paths are built by calling PathFinder::buildSyncedPath().
Also removed useless comment.
10 years ago
scrawl
59db9664ba
Pass the CharacterController to AiPackage::execute
10 years ago
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
10 years ago
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.
10 years ago
scrawl
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
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.
10 years ago
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
7bacb9418d
Various math code ported to osg
10 years ago
scrawl
fd50be0fb8
Restore various gameplay
10 years ago
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
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
scrawl
8c810e3620
Move rng to components
10 years ago
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
10 years ago
dteviot
be6ee927b9
AiWander, use closest two points if distance is too small ( Fixes #1317 )
...
In AiWander, if wander distance is set too small to get two points, take the closest two points.
10 years ago
dteviot
63ab856024
Removed duplicated code.
10 years ago
dteviot
eb1090a1b6
Waypoint check only considers X & Y distance ( Fixes #2423 )
...
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
10 years ago
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
dteviot
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
10 years ago
scrawl
bf915d929a
Update idle voices according to research
10 years ago
scrawl
a3c861b7fa
Idle voice fix
10 years ago
scrawl
871d59de6c
Reduce Idle voice chance ( Fixes #1964 )
10 years ago
scrawl
b108fbe986
Remove incorrect implementation of fGreetDistanceReset
...
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
10 years ago
scrawl
4d9100091d
Reduce default pathing arrival tolerance to 32 units ( Fixes #1605 )
10 years ago
scrawl
92e4a0669c
Fix for AiWander state loading
10 years ago
scrawl
559ddbb480
Quick fix for Ai fast-forward crash in exteriors ( Fixes #2241 )
10 years ago
scrawl
01652bbcc5
Store original actor position in AiWander package ( Fixes #2200 )
10 years ago
scrawl
a8ae0dec52
Implement AiWander fast-forward (Feature #1125 )
10 years ago
scrawl
a1226501fa
AiWander: move idle animation handling to non-delayed section ( Fixes #2073 )
10 years ago
scrawl
61d1aa78ce
Move AiWander path finder to temporary storage ( Fixes #2082 )
10 years ago
terrorfisch
4eb1668467
references now initialized when they are needed
10 years ago
terrorfisch
730abf6841
Moved all variables in temporary storage for AiCombat and some more for AiWander.
...
+Buxfix for previous AiWander changes
10 years ago
terrorfisch
4391c1fd00
Addded the parts of AiWander that I fully understand to the temporary storage.
...
The rest should be done by someone who has a clearer overview over the class.
10 years ago
terrorfisch
0871d45790
Draft how to move temporary package state to CharacterController.
...
Example for a few values shown in AiWander.
10 years ago
scrawl
7252cb63a6
Fix cppcheck issues
10 years ago
scrawl
780a48cd1e
Don't greet dead actors in AiWander
10 years ago
scrawl
9caff1d800
Don't say Idle voices when player is not in LOS ( Fixes #1436 )
10 years ago