dteviot
|
40a925ad37
|
Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726
|
2015-07-07 18:16:15 +12:00 |
|
Marc Zinnschlag
|
e89614a35d
|
Merge remote-tracking branch 'origin/master'
|
2015-07-06 13:10:04 +02:00 |
|
Marc Zinnschlag
|
88f1220a77
|
Merge remote-tracking branch 'dteviot/Bug2726'
|
2015-07-06 13:07:40 +02:00 |
|
scrawl
|
49c07de773
|
Merge pull request #643 from ace13/win-build-fix
Fix build error and a pair of warnings
|
2015-07-05 22:24:24 +02:00 |
|
Alexander "Ace" Olofsson
|
aaaee74a4d
|
Fix the comments
|
2015-07-05 21:56:04 +02:00 |
|
scrawl
|
531bca1273
|
Add a threshold for changing aicombat targets (Fixes #2755)
|
2015-07-05 18:09:13 +02:00 |
|
Marc Zinnschlag
|
432384d280
|
Merge remote-tracking branch 'scrawl/aicombat'
|
2015-07-05 14:47:20 +02:00 |
|
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.
|
2015-07-05 18:21:35 +12:00 |
|
dteviot
|
eb2aa965b9
|
Extracted function SetCurrentNodeToClosestAllowedNode()
|
2015-07-05 18:17:18 +12:00 |
|
dteviot
|
76f20b8b20
|
fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning.
|
2015-07-05 18:10:02 +12:00 |
|
dteviot
|
0095737c40
|
Use correct type of variable. Remove unnecessary casts.
|
2015-07-05 18:09:14 +12:00 |
|
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 |
|
scrawl
|
c90841d649
|
Fix head tracking for NPCs
|
2015-07-04 21:00:01 +02: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
|
6bcea21e14
|
Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876)
|
2015-07-04 05:19:05 +02:00 |
|
scrawl
|
a7bd050928
|
Accurate attack timings in AiCombat
|
2015-07-03 05:58:12 +02:00 |
|
scrawl
|
741e5db862
|
Fix for non-bipedal creatures that use weapons, e.g. rieklings
|
2015-07-03 05:37:18 +02:00 |
|
scrawl
|
82740c1645
|
Remove completely broken code
|
2015-07-03 02:29:42 +02:00 |
|
scrawl
|
d07b176b36
|
Take into account hit recovery, knockdown and other animations for AiCombat attack timing
|
2015-07-03 02:18:35 +02:00 |
|
scrawl
|
520a832a9a
|
Remove an already resolved todo comment
|
2015-07-02 22:24:23 +02:00 |
|
scrawl
|
6724585777
|
Light magic effect
Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364)
|
2015-07-02 20:46:34 +02:00 |
|
scrawl
|
bf9c62fa42
|
Fix for some coverity scan defects
|
2015-07-02 20:46:34 +02:00 |
|
scrawl
|
dcb8fbc69c
|
Accurate handling of fog depth/density (Fixes #2752)
|
2015-07-02 20:46:34 +02:00 |
|
scrawl
|
6691891bee
|
Include cleanup
|
2015-07-02 19:16:44 +02:00 |
|
scrawl
|
a1432b0255
|
Move attackingOrSpell flag to the CharacterController
|
2015-07-02 19:14:28 +02:00 |
|
scrawl
|
519fb9482a
|
Minor cleanup
|
2015-07-02 18:45:11 +02:00 |
|
Alexander "Ace" Olofsson
|
5d24091364
|
Fix build error and a pair of warnings
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
|
2015-07-01 15:06:38 +02:00 |
|
scrawl
|
20d03c7e39
|
Refuse loading save games of unknown format
|
2015-06-30 17:41:44 +02:00 |
|
scrawl
|
a081d402c5
|
Use the format field instead of version field
|
2015-06-30 17:26:33 +02:00 |
|
scrawl
|
4637750601
|
Savegame loading optimization
|
2015-06-30 16:47:41 +02:00 |
|
scrawl
|
4eaaa5e855
|
Increment save file version and mark it as used, will be used in next commit
|
2015-06-30 16:47:40 +02:00 |
|
scrawl
|
ca21e9ecb1
|
Fix magic hit VFX showing when casting on a static object
|
2015-06-30 03:14:49 +02:00 |
|
scrawl
|
4b2391c60f
|
Ignore effect meshes in getScreenBounds
|
2015-06-30 02:51:32 +02:00 |
|
scrawl
|
d5a47cfafe
|
Include cleanup
|
2015-06-30 01:41:03 +02:00 |
|
scrawl
|
017c9f7ac9
|
Fading for weather particle effects
|
2015-06-29 20:19:46 +02:00 |
|
scrawl
|
cd2e6d4436
|
Move the __STDC_CONSTANT_MACROS define to cmakelists
|
2015-06-28 05:53:03 +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
|
a44be148d8
|
Fix door collisions
|
2015-06-26 06:40:28 +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
|
4ef6aa6b7f
|
Fix weather particles disappearing
|
2015-06-26 02:30:39 +02:00 |
|
scrawl
|
ea0339d471
|
Make the string argument to BetaComment optional
|
2015-06-25 21:45:59 +02:00 |
|
scrawl
|
8a3889a81e
|
Rain fading
|
2015-06-25 17:38:12 +02:00 |
|
scrawl
|
3a21f05f6e
|
Rain effect
|
2015-06-25 17:23:01 +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 |
|