Marc Zinnschlag
03a35c38df
add missing item when executing the Equip instruction
2016-09-06 16:33:26 +02:00
Marc Zinnschlag
48c257b939
Merge remote-tracking branch 'aesylwinn/ContentNumberFix'
2016-09-06 15:48:05 +02:00
scrawl
05e4542d33
Merge pull request #1048 from mrcheko/pathfinding
...
Pathfinding unification v2
2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648
AiPackage: fix path recalc on cell change
...
AiTravel: remove unneeded code
2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947
aiwander: reset path on cell change
...
remove redundant mIsWanderDestReady var
2016-09-05 15:18:34 +03:00
Marc Zinnschlag
b8fa555260
Merge remote-tracking branch 'aesylwinn/RandomFixes'
2016-09-05 11:10:34 +02:00
scrawl
fbc9b90ebe
Cleanup
2016-09-05 00:04:11 +02:00
scrawl
8677a6f803
Merge pull request #1044 from Allofich/magic
...
Changes to multi-effect spells
2016-09-05 00:03:10 +02:00
Allofich
c617e90755
Fix for loading projectile speed
2016-09-05 05:41:24 +09:00
Allofich
f8270f6bd5
Consolidations and cleanup for multi-effect spells
2016-09-05 05:30:51 +09:00
Allofich
dbd7c038b2
Add loading code for multi-effect projectiles
2016-09-05 03:45:13 +09:00
Allofich
c6cd1f813b
Attach projectiles to nodes of multi-effect bolts
2016-09-05 02:59:33 +09:00
Allofich
5a0d3feb98
Use C++ int-to-string conversion
2016-09-05 02:52:44 +09:00
Allofich
a36f7babc1
Double scaling of spell explosions
2016-09-05 02:18:57 +09:00
Allofich
60384399ee
Fix errors and warnings
2016-09-05 01:39:18 +09:00
Allofich
f49ebee56a
Play sounds for multi-effect projectile
2016-09-04 23:57:06 +09:00
Allofich
37f07f7435
Combine into one multi-effect magic projectile
2016-09-04 22:35:29 +09:00
Allofich
10842462c7
Send lists of models and sounds to launchMagicBolt
2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d
Fix warnings
2016-09-04 17:42:27 +09:00
Allofich
ecec7d8215
Fix spells having explosions for wrong range type
2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b
Casting animation comes from the first effect
2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7
Don't apply projectile effects multiple times
2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403
Use last effect of spell for hand effect color
2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e
Use average speed for multiple spell projectiles
2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2
Shoot projectiles of spells with multiple effects
2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8
Play all of a spell's casting effects
2016-09-04 17:42:27 +09:00
Allofich
b4577fe751
Allow multiple spell hit sounds on single target
2016-09-04 17:42:27 +09:00
scrawl
7859e378df
Merge pull request #1045 from Allofich/attack
...
Fix AI melee attack
2016-09-04 00:22:59 +02:00
Aesylwinn
fab7549b42
Fix windows path issue in editor debug run.
...
- The problem was caused by spaces in the data directory
2016-09-03 17:49:49 -04:00
Aesylwinn
ee432690e6
Make it easier to place objects in the scene editor.
...
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
2016-09-03 17:37:13 -04:00
Allofich
5c2bc515fe
Remove overridden code in aicombat
2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea
fix zero div in getXAngleToDir
2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0
Remove no longer used parameter
2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f
Remove attacktype movement
2016-09-03 21:16:59 +09:00
scrawl
bdf55927e1
Merge pull request #1041 from Allofich/waterwalking
...
Don't allow casting Water Walking in deep water
2016-09-02 02:57:22 +02:00
Allofich
154dcc942c
Let NPCs use attack type regardless of movement
2016-09-01 22:43:33 +09:00
Marc Zinnschlag
316cf40f12
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
2016-09-01 11:51:34 +02:00
Allofich
b99c2c54d8
Allow Water Walking on non-submerged creatures
2016-09-01 03:53:53 +09:00
Aesylwinn
c0d53a2557
Fix CellRefs being teleported from interior to exterior cells.
2016-08-31 11:02:04 -04:00
Allofich
22b11c5947
Move Water Walking check into checkEffectTarget()
2016-08-31 23:56:31 +09:00
Allofich
f25c65260c
Limit sMagicinvalidEffect to self-cast spells
2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b
Use castByPlayer bool
2016-08-31 17:18:23 +09:00
Aesylwinn
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
2016-08-30 16:42:38 -04:00
Allofich
a6216d883f
Don't allow casting Water Walking in deep water
2016-08-31 04:37:50 +09:00
Aesylwinn
3ae2fc17c6
Fix some issues with content file numbers in the editor.
...
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
2016-08-29 18:06:56 -04:00
Allofich
9e1bfde46f
Add comment
2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7
Disable current idle when an action is taken
2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d
Update idle if current idle finishes playing
2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399
Sometimes play 1st-person weapon idle to Stop key
2016-08-25 21:34:45 +09:00
Allofich
7db31ab58a
Correct telekinesis glow length
2016-08-24 01:21:15 +09:00
scrawl
346f5a19a3
Merge pull request #1029 from Allofich/anim
...
Improvements for playgroup and loopgroup
2016-08-23 14:14:36 +02:00
Allofich
9b0e5d6b59
Loop mid-animation idles when loading a save game
2016-08-23 19:50:56 +09:00
scrawl
0fd810707e
Remove unused stopLooping()
2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18
Run setLoopingEnabled after the anim queue is updated
2016-08-22 23:33:24 +02:00
scrawl
719e884b7c
Remove duplicate code
2016-08-22 23:25:00 +02:00
scrawl
0c9882956a
Add AnimState::shouldLoop()
2016-08-22 23:25:00 +02:00
scrawl
6450c9be27
Simplify condition
2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b
Emulate vanilla animation loops more closely
2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f
Revert "Revert "Merge pull request #993 from mrcheko/pathfinding""
...
This reverts commit 3732979eec
.
2016-08-19 22:15:26 +03:00
Aesylwinn
91fd966146
Fix some issues detected by coverity for the editor.
2016-08-18 12:42:35 -04:00
Allofich
b332a13b4e
Don't restart looped animations on repeated calls
2016-08-18 23:23:38 +09:00
Marc Zinnschlag
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
2016-08-18 09:13:43 +02:00
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3
LocalMap no longer depends on osgViewer
2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb
Remove unneeded setGraphicsContext() calls
2016-08-16 19:33:09 +02:00
scrawl
0209c70583
Improve performance by skipping update if transform is unchanged
2016-08-16 17:50:59 +02:00
scrawl
4751e0e953
Improve performance of animateCollisionShapes by caching the node path
2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84
Revert "animateCollisionShape checks if the shape is really animated"
...
This reverts commit cbf344663f
.
Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d
Merge pull request #1025 from Allofich/anim
...
Use loopfallback for idle animation groups
2016-08-16 16:30:55 +02:00
Aesylwinn
7125775648
Change free axis rotation.
2016-08-15 15:07:43 -04:00
Allofich
c05782581e
Account for all instances of play()
2016-08-16 02:52:55 +09:00
Allofich
6163c7bb03
Use loopfallback for idle animation groups
2016-08-16 01:15:26 +09:00
scrawl
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
2016-08-15 18:12:46 +02:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
Aesylwinn
3e4ac0c662
Potential fix for context sensitive select mode issues.
2016-08-14 14:43:29 -04:00
scrawl
71f786ff84
Delete the WorkQueue first
...
Fixes a potential crash on exit.
2016-08-14 18:10:29 +02:00
scrawl
3732979eec
Revert "Merge pull request #993 from mrcheko/pathfinding"
...
This reverts commit 5190275b37
, reversing
changes made to d7845012bf
.
2016-08-14 18:04:33 +02:00
scrawl
c3340ec143
Merge pull request #1022 from Allofich/anim
...
Make loopgroup loop correct number of times
2016-08-14 17:02:38 +02:00
scrawl
1edcea2ff5
Merge pull request #1023 from psi29a/small_fixes
...
small fixes
2016-08-14 16:49:26 +02:00
scrawl
30b549124e
Fix use-after-free
2016-08-14 16:42:29 +02:00
scrawl
c65492193c
Use osg::clone
2016-08-14 16:41:44 +02:00
scrawl
0fbc0d0da7
Attempt to silence warning
2016-08-14 16:41:17 +02:00
Bret Curtis
0547d4b937
clang says that these must be in the MWWorld namespace
2016-08-14 16:17:09 +02:00
scrawl
8c44334409
Merge pull request #1021 from Allofich/weight
...
Corrections to tooltip displays of zero-weight items
2016-08-14 15:14:58 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
Allofich
a381a15b19
Make loopgroup loop correct number of times
2016-08-14 21:57:06 +09:00
Allofich
7bf04b5014
Allow showing value of zero-weight lights
2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff
Use getWeightString() to avoid casting to int
2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e
Allow weight tooltips for gold and keys if not 0
2016-08-14 19:32:43 +09:00
Allofich
caf025f93d
Don't show 0 weight tooltips except for potions
2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae
Don't show weight tooltip for 0-weight equipment
2016-08-14 18:37:41 +09:00
Allofich
ee2702087c
Make zero-weight boots play light boot footsteps
2016-08-14 17:27:47 +09:00
scrawl
f3f02fe154
Merge pull request #1019 from Allofich/bound
...
Don't allow re-casting of bound equipment spells
2016-08-13 21:02:32 +02:00
Allofich
d617651307
Don't allow re-casting of bound equipment spells
2016-08-14 02:05:23 +09:00
Aesylwinn
101c3cc90d
Rotate around center of selection.
2016-08-12 17:12:10 -04:00
Aesylwinn
571969cd65
Scale from center of selection.
2016-08-12 17:11:37 -04:00
MiroslavR
ddbfe0c944
Fix disabled door markers appearing on the map ( Fixes #3348 )
2016-08-12 03:14:36 +02:00
Aesylwinn
388917df89
Base editor rotate/scale commit.
2016-08-10 19:31:34 -04:00
Allofich
cb9bb92b26
Play locked sounds on locked objects instead of actors
2016-08-10 21:31:14 +09:00