mrcheko
|
e2cd87fcc7
|
fix veritcal aiming
|
2016-08-07 19:23:08 +03:00 |
|
mrcheko
|
293a0f768c
|
use real distance to target to determinate 'ready to attack' state
|
2016-07-27 23:43:32 +03:00 |
|
mrcheko
|
203804ff15
|
fix AiPackage repeating
|
2016-07-16 19:08:49 +03:00 |
|
mrcheko
|
59a1a6d117
|
checkWayIsClear: remove PATHFIND_CAUTION_DIST check
|
2016-07-16 19:07:48 +03:00 |
|
mrcheko
|
b4e94e2aae
|
Merge remote-tracking branch 'upstream/master' into pathfinding
# Conflicts:
# apps/openmw/mwmechanics/aipackage.cpp
# apps/openmw/mwmechanics/aipackage.hpp
|
2016-07-12 00:45:01 +03:00 |
|
mrcheko
|
8d4f0660ce
|
fix hardcoded melee attack ranges
|
2016-07-12 00:17:43 +03:00 |
|
scrawl
|
cff37cdd08
|
Merge pull request #999 from Allofich/aifix
Trim unneeded code
|
2016-07-11 23:04:26 +02:00 |
|
scrawl
|
33ab9db9f6
|
Merge pull request #1000 from MiroslavR/particle-range
Fix doubled particle spawn range
|
2016-07-11 23:03:04 +02:00 |
|
MiroslavR
|
9c6739f1b3
|
Fix doubled particle spawn range
|
2016-07-11 22:40:58 +02:00 |
|
Allofich
|
c57d177f1c
|
Trim unneeded code
|
2016-07-12 04:17:08 +09:00 |
|
scrawl
|
432723bfe6
|
Merge pull request #997 from MiroslavR/inactive-kfctrls
Do not skip inactive keyframe controllers
|
2016-07-10 20:48:59 +02:00 |
|
MiroslavR
|
2a987b6857
|
Do not skip inactive keyframe controllers (Bug #1942)
|
2016-07-10 19:02:28 +02:00 |
|
scrawl
|
2329812988
|
Merge pull request #995 from Allofich/traps
Trap and lock fixes
|
2016-07-10 17:19:36 +02:00 |
|
scrawl
|
67d3571fac
|
Fix activation distance in third person mode
|
2016-07-10 17:10:19 +02:00 |
|
scrawl
|
9375cbea44
|
Make NIFFilePtr const
|
2016-07-10 17:10:19 +02:00 |
|
mrcheko
|
05794505c8
|
travis build fix
|
2016-07-10 17:25:50 +03:00 |
|
Allofich
|
599e6708ec
|
Allow using keys to open trapped objects of lock level 0
|
2016-07-10 23:08:11 +09:00 |
|
Allofich
|
cabe038a97
|
Make lockpick and probe sounds 3d positional
|
2016-07-10 22:08:42 +09:00 |
|
Allofich
|
249918612d
|
Play trap disarm sound when key used on trapped object
|
2016-07-10 22:06:35 +09:00 |
|
Allofich
|
d4e656ceaf
|
Play trap activation sound on trapped object, not actor
|
2016-07-10 21:39:53 +09:00 |
|
mrcheko
|
f57858b750
|
Merge remote-tracking branch 'upstream/master' into pathfinding
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
|
2016-07-10 14:36:48 +03:00 |
|
scrawl
|
251ba041f3
|
Merge pull request #994 from MiroslavR/no-scroll-stacking
Don't stack effects for scrolls of the same type
|
2016-07-10 05:45:42 +02:00 |
|
MiroslavR
|
b0fcad4cb8
|
Don't stack effects for scrolls of the same type (Fixes #3466)
|
2016-07-10 03:49:09 +02:00 |
|
scrawl
|
da0e20edcd
|
Merge pull request #991 from MiroslavR/opface
Implement Face instruction (Feature #1424)
|
2016-07-10 02:10:23 +02:00 |
|
MiroslavR
|
75a66ced20
|
Fix actors lacking turning animations while in first person mode
|
2016-07-10 01:48:54 +02:00 |
|
mrcheko
|
d2fe6fe857
|
Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding
# Conflicts:
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/aicombat.hpp
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/aipackage.cpp
# apps/openmw/mwmechanics/aipackage.hpp
# apps/openmw/mwmechanics/aiwander.cpp
# apps/openmw/mwmechanics/aiwander.hpp
|
2016-07-09 22:59:54 +03:00 |
|
scrawl
|
c842d4976e
|
Merge pull request #992 from MiroslavR/msgformat
Improve format specifiers for message boxes
|
2016-07-09 20:00:30 +02:00 |
|
MiroslavR
|
f6f3f71db5
|
Improve format specifiers for message boxes
|
2016-07-09 03:18:45 +02:00 |
|
MiroslavR
|
dc0bc5b68c
|
Implement Face instruction (Feature #1424)
|
2016-07-09 02:16:47 +02:00 |
|
scrawl
|
6f376bd499
|
Merge pull request #983 from Allofich/telekinesis
Don't allow telekinesis on actors or teleport doors
|
2016-07-08 23:47:43 +02:00 |
|
Allofich
|
7a0f9a7989
|
Clean up, remove unnecessary code changes
|
2016-07-09 02:24:08 +09:00 |
|
Allofich
|
53ceefa46a
|
Allow some telekinesis on teleport doors
|
2016-07-09 01:08:00 +09:00 |
|
Allofich
|
4e54338ce0
|
Implement and use getDistanceToFacedObject()
|
2016-07-08 23:28:49 +09:00 |
|
scrawl
|
8332f26887
|
Merge pull request #989 from AlexanderKurtz/master
Update gamecontrollerdb.txt from upstream.
|
2016-07-07 18:37:06 +02:00 |
|
scrawl
|
b0a37553b2
|
Merge pull request #988 from nikolaykasyanov/osx-cmake-min-version
OS X: specify minimum CMake version & remove redundant argument from CI script
|
2016-07-07 18:36:54 +02:00 |
|
Alexander Kurtz
|
ff3b7de0e7
|
Update gamecontrollerdb.txt from upstream.
|
2016-07-07 18:31:49 +02:00 |
|
Allofich
|
0e5c3f781f
|
Only allow trap distance check to apply to player
|
2016-07-07 22:10:38 +09:00 |
|
Allofich
|
7de3afaa7d
|
Cleanups
|
2016-07-07 21:57:00 +09:00 |
|
Allofich
|
cb621939fd
|
Streamline trap code
|
2016-07-07 21:56:54 +09:00 |
|
Allofich
|
35a23c3b49
|
Implement and use new method allowTelekinesis()
|
2016-07-07 21:54:31 +09:00 |
|
Allofich
|
8014f37879
|
Avoid duplicate code
|
2016-07-07 21:54:30 +09:00 |
|
Allofich
|
538209b0a2
|
Change variable to mRatio and initialize it
|
2016-07-07 21:54:29 +09:00 |
|
Allofich
|
e25e698978
|
Fix telekinesis check for activators
|
2016-07-07 21:54:29 +09:00 |
|
Nikolay Kasyanov
|
bf0ec550da
|
OS X: specify minimum CMake version & remove redundant argument from CI script
|
2016-07-07 01:09:59 +02:00 |
|
scrawl
|
b94a4c1c77
|
Merge pull request #986 from MiroslavR/resting-effects
Apply magic effects while waiting/sleeping
|
2016-07-06 02:38:52 +02:00 |
|
MiroslavR
|
80f2ae0ca7
|
Apply magic effects while waiting/sleeping
|
2016-07-06 00:20:23 +02:00 |
|
MiroslavR
|
41484432b4
|
Player's death now interrupts waiting/sleeping
|
2016-07-06 00:15:25 +02:00 |
|
MiroslavR
|
d4e29e3e0c
|
Clear projectiles on non-incremental time advances
|
2016-07-06 00:11:58 +02:00 |
|
mrcheko
|
0793e4a80e
|
refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck
|
2016-07-05 21:38:41 +03:00 |
|
Allofich
|
c1236f4113
|
Simplified code
|
2016-07-04 20:25:25 +09:00 |
|