MiroslavR
1d3008594d
Autoequip weapons ( Fixes #3562 )
2016-10-18 13:57:35 +02:00
MiroslavR
14240cf7a2
Fix autoEquip to better match vanilla ( Fixes #3590 )
2016-10-16 17:27:17 +02:00
scrawl
1d58733880
Merge pull request #1104 from MiroslavR/missing-weather-states
...
Import base weather states before loading region modifiers
2016-10-15 22:17:20 +02:00
Allofich
ccacad51be
Fix shadowing warnings
2016-10-16 01:34:54 +09:00
MiroslavR
7b59eda13a
Import base weather states before loading region modifiers ( Fixes #3594 )
2016-10-15 17:34:03 +02:00
scrawl
9e63c3ce63
Merge pull request #1103 from Allofich/warnings
...
Fix shadowing warnings
2016-10-14 21:18:12 +02:00
scrawl
5ccbabc27d
Fix build against bullet with profiler disabled ( Fixes #3592 )
2016-10-14 21:00:35 +02:00
Allofich
1c54f54ab8
Fix shadowing warnings
2016-10-15 00:12:46 +09:00
scrawl
2ed0277839
Merge pull request #1102 from Allofich/spells
...
Change several spell effects from instant to non-instant
2016-10-13 21:36:14 +02:00
scrawl
9d2e0124dc
Revert "Fix the cell changed flag no longer being reset after the player dies"
...
This reverts commit d7acec74fd
2016-10-13 17:44:03 +02:00
Allofich
610f36f47b
Set magic effects that don't support variable durations to use duration of 1
2016-10-14 00:13:08 +09:00
Allofich
1c2e04747d
Remove stray line
2016-10-13 23:38:21 +09:00
Allofich
675bd09462
Change several instant effects to be non-instant ( Fixes #2054 )
2016-10-13 23:38:21 +09:00
scrawl
db09858f59
Don't allow the player to activate objects when dead
2016-10-13 14:42:10 +02:00
scrawl
454d1ffaef
Make the cell change check during actor update more robust
2016-10-13 14:39:58 +02:00
scrawl
d7acec74fd
Fix the cell changed flag no longer being reset after the player dies
2016-10-13 14:38:35 +02:00
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
2016-10-13 01:42:50 +02:00
scrawl
15046c961b
Merge pull request #1101 from MiroslavR/ignored-light-sources-fix
...
Ignored light sources fix
2016-10-12 01:11:37 +02:00
MiroslavR
611d02ad43
Remove unused code
2016-10-11 22:16:17 +02:00
MiroslavR
1906d96064
Non-player actors emitting light from a non-portable light item should be illuminated ( Fixes #3588 )
2016-10-11 22:15:51 +02:00
MiroslavR
53b006eccb
OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification ( Fixes #3564 )
2016-10-11 19:36:44 +02:00
scrawl
3dce155d96
Fix uninitialized variable
2016-10-11 14:50:13 +02:00
MiroslavR
8be8c7ca66
OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564 )
2016-10-11 02:55:17 +02:00
MiroslavR
14468262a7
Fix "Not Local" dialog test to also test variable value instead of just its existence ( Fixes #3577 )
2016-10-11 02:53:43 +02:00
scrawl
95a67bf0c2
Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads
...
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
2016-10-10 18:23:06 +02:00
scrawl
530fb61ad0
Use OpenThreads instead of boost thread
...
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.
With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.
So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread
This patch opts for 3.)
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
2016-10-10 18:23:06 +02:00
scrawl
ae2036fa85
Merge pull request #1097 from Allofich/persuasion
...
Don't let intimidate bring disposition below 0 (Fixes #3584 )
2016-10-09 20:20:43 +02:00
Allofich
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
2016-10-10 02:20:24 +09:00
scrawl
1893617ec9
Improvements to ignored light list setting
...
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.
Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966
Make actors with non-portable lights in inventory glow ( Closes #2042 , #3338 )
2016-10-08 23:17:12 +02:00
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
2016-10-08 19:20:24 +02:00
scrawl
6615330430
Fix use of UnrefQueue in removeObject
2016-10-08 16:41:17 +02:00
scrawl
3019d70986
Use 'default icon' for items with no icon specified
2016-10-08 16:05:20 +02:00
scrawl
37bfa88b2d
Merge pull request #1094 from Allofich/alchemy
...
Fix reversed use of alembics and retorts
2016-10-06 19:02:24 +02:00
Allofich
498976775a
Fix reversed use of alembics and retorts
2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23
Merge pull request #1092 from Allofich/warnings
...
Fix shadowing warnings
2016-10-06 17:50:26 +02:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
Allofich
df03b32205
Coverity fixes
2016-10-05 23:32:26 +09:00
scrawl
721062a4bd
Merge pull request #1089 from Allofich/bound
...
Corrections for bound equipment
2016-10-04 18:34:27 +02:00
Allofich
506d0e8e54
Correction to display of 0-weight tooltips
2016-10-04 23:02:45 +09:00
Allofich
160da0b149
Treat 0-weight armor as light armor in some respects
2016-10-04 23:02:25 +09:00
MiroslavR
a05649e1d5
Use loop fallback for movement animations ( Fixes #3578 )
2016-10-03 22:36:56 +02:00
sandstranger
5230bf6528
disable using shaders for gles1 and Android
2016-10-03 20:31:08 +04:00
scrawl
44dffe55ab
Merge pull request #1083 from Allofich/onhit
...
Make AI response to spell hits more like original MW
2016-10-02 14:06:51 +02:00
scrawl
3d76ba5a7c
Merge pull request #1086 from Allofich/warnings
...
Fix shadowing warnings
2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb
Fix shadowing warnings
2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2
Consider reflected/absorbed hostile spells as assaults
2016-10-02 16:08:24 +09:00
MiroslavR
210c02d98e
Fix interactive ID validity checks in TypesetBookImpl
2016-10-01 21:07:17 +02:00
Allofich
a81a04e6d0
Remove unused line
2016-10-02 01:11:01 +09:00
Allofich
fa17784722
Change breaks to continues
2016-10-02 00:54:01 +09:00
scrawl
140be70a90
Merge pull request #1082 from Gladdy/master
...
Fix for segmentation fault on entering a cell
2016-10-01 16:42:47 +02:00
scrawl
b170efb9fa
Merge pull request #1084 from Allofich/water
...
Don't let water-only creatures prevent resting
2016-10-01 16:14:19 +02:00
Allofich
a2e174a40f
Don't let water-only creatures prevent resting
2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc
Make AI response to spell hits more like original MW
2016-10-01 21:38:17 +09:00
Marc Zinnschlag
e918474a94
Merge remote-tracking branch 'rcutmore/bug-3277'
2016-09-30 09:37:45 +02:00
Rob Cutmore
8f47ed17df
Show nested tables only when they are editable
2016-09-29 20:42:44 -04:00
Martijn Bakker
45ffdbb284
fixed a segmentation fault when entering a cell which contains someone already attacking you
2016-09-30 00:40:13 +01:00
scrawl
85c7d014d3
Use a shader to render the simple water, ensuring that fog is applied per pixel ( Fixes #2716 )
2016-09-28 21:10:44 +02:00
Rob Cutmore
b59694c4f0
Set tooltip for read-only nested tables
2016-09-25 06:31:28 -04:00
Marc Zinnschlag
eaeaae3243
Merge remote-tracking branch 'aesylwinn/FixRefIdData'
2016-09-25 09:33:28 +02:00
scrawl
4791fadb9a
Merge pull request #1078 from MiroslavR/hidden-items
...
Do not show uncarriable lights in item views
2016-09-24 23:27:23 +02:00
Aesylwinn
b899d43a33
Allow base plugins to overwrite referencables made in other base plugins.
2016-09-24 16:45:08 -04:00
scrawl
dc07885d25
Merge pull request #1069 from Allofich/combat
...
Add unarmed attack selection to chooseBestAttack()
2016-09-24 18:38:10 +02:00
MiroslavR
52e00f5fef
Do not show uncarriable lights in item views
2016-09-24 18:01:31 +02:00
Rob Cutmore
829345257c
Allow disabled nested tables to be scrollable
2016-09-24 10:36:00 -04:00
Allofich
0582f2d918
Adjust touch spell/telekinesis interaction
2016-09-23 21:44:49 +09:00
Allofich
0c603e986d
Don't play touch spell explosions on non-activatable statics
2016-09-23 03:25:24 +09:00
Allofich
eecf412b85
Recreate vanilla-like behavior for telekinesis and touch spells
2016-09-23 01:16:03 +09:00
Allofich
04c13ffab3
Add unarmed attack selection to chooseBestAttack()
2016-09-22 00:45:54 +09:00
scrawl
8379291f70
Merge pull request #1072 from Allofich/range
...
Give "on touch" spells same range as vanilla MW
2016-09-21 17:39:44 +02:00
Allofich
37cc4e9efe
Don't play area vfx for 0-area touch spells that hit non-actors
2016-09-22 00:14:08 +09:00
Allofich
563ae479e8
Give "on touch" spells same range as vanilla MW
2016-09-21 23:34:32 +09:00
scrawl
c6ef26ba4b
Merge pull request #1070 from mrcheko/pathfinding
...
fix using potion as weapon
2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386
remove dynamic_cast to ActionPotion
2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2
fix using potion as weapon
2016-09-19 23:43:26 +03:00
scrawl
718178bfe9
Merge pull request #1066 from MiroslavR/setinvisible
...
Don't use base invisibility magnitude for setting alpha
2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37
Vfx after Divine/Almsivi intervention should be attached to player
2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10
Use correct vfx for teleport spells
2016-09-19 18:12:30 +09:00
MiroslavR
744667e163
Don't use base invisibility magnitude for setting alpha ( Fixes #3555 )
2016-09-19 00:05:50 +02:00
scrawl
cd4b182091
Merge pull request #1051 from Allofich/textures
...
Use spell effect particle textures
2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67
Cleanup
2016-09-19 05:20:04 +09:00
scrawl
30d5c7488d
savegamedialog: don't reset the character selection scrollbar when a character is deleted
2016-09-18 19:26:41 +02:00
scrawl
8520b97b37
Merge pull request #1062 from stil-t/master
...
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
2016-09-17 18:09:51 +02:00
scrawl
7bd445fb83
Don't crash if FontManager::getByName returns NULL ( Fixes #3552 )
2016-09-17 17:21:35 +02:00
Mikhail Korolev
7e2fe77836
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
2016-09-15 19:03:07 +03:00
scrawl
7bbdeb5f85
Merge pull request #1061 from MiroslavR/nameless-actors
...
Allow activating actors without a name
2016-09-15 17:51:14 +02:00
MiroslavR
f323f231db
Allow activating actors without a name ( Fixes #3551 )
2016-09-15 16:47:50 +02:00
Allofich
5aad1d81f4
Remove no longer used parameter
2016-09-15 23:41:20 +09:00
MiroslavR
55e670c5fe
Fix animation state not saving
...
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
2016-09-15 16:11:54 +02:00
Allofich
322a0ba8bb
Initialize speed for magic projectiles
2016-09-14 21:39:44 +02:00
Allofich
7eb62b5d3a
Initialize speed for magic projectiles
2016-09-15 01:44:53 +09:00
Allofich
dc8ff5e49b
Play all sfx and use particle textures for permanent enchantments
2016-09-15 00:27:08 +09:00
Allofich
527bbd5243
Change size_t to int for consistency
2016-09-15 00:09:40 +09:00
Allofich
01774c656c
Fix for blood effect texture overrides
2016-09-14 23:28:57 +09:00
Allofich
a033ba3bd2
Override spell textures by NiTexturingProperty
2016-09-14 23:03:04 +09:00
scrawl
1362264561
Fix warning
2016-09-13 02:49:19 +02:00
scrawl
65dc12cdd6
Remove unused parameter
2016-09-13 02:48:36 +02:00
scrawl
feaf3652a5
Merge pull request #1055 from mrcheko/pathfinding
...
prevent running in circles around path points
2016-09-13 02:47:49 +02:00
scrawl
3cd73d0fc3
Merge pull request #1058 from Allofich/onhit
...
Don't play blood effects for completely resisted hits
2016-09-13 02:47:43 +02:00
Allofich
34851349de
Pass hitPosition by const reference
2016-09-13 00:59:56 +09:00
Allofich
bce0166931
Don't play blood effects for resisted hits
2016-09-12 22:46:32 +09:00
Allofich
3bbde312b9
Remove unneeded code
2016-09-12 19:54:06 +09:00
Allofich
3f6543860a
Make creatures use fHandToHandReach
2016-09-11 00:01:20 +09:00
Allofich
c98d4e0473
Allow dodging for bipedal creatures
2016-09-10 23:56:31 +09:00
Allofich
7bc4535c0d
Make NPCs dodge according to target's weapon reach
2016-09-10 23:30:46 +09:00
mrcheko
72786fef9d
prevent running in circles around path points
...
addresses http://bugs.openmw.org/issues/2229
2016-09-09 23:57:19 +03:00
Allofich
368828b217
Update TODO comments
2016-09-10 01:38:05 +09:00
Allofich
f31342894a
Put simpler condition first
2016-09-09 00:03:38 +09:00
Allofich
bca477ca8a
Apply particle textures like original engine does
2016-09-08 23:59:23 +09:00
Allofich
85349da26c
Add comments
2016-09-08 23:58:00 +09:00
Allofich
502a758eff
Use particle texture for "hit" effects
2016-09-08 23:58:00 +09:00
Allofich
fe3a033642
Use particle textures for spell projectiles
2016-09-08 23:56:54 +09:00
Allofich
02610828c1
Don't play area vfx for non-area spells on actors.
2016-09-08 02:07:01 +09:00
Allofich
88d992a020
Create area effect visual for non-area spells
2016-09-08 00:05:45 +09:00
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
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 5190275b37d7845012bf
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
Allofich
83b715734f
Move part of addGlow() to addSpellCastGlow()
2016-08-10 02:52:43 +09:00
Allofich
1c76c93ed8
Use raw pointer to node in glowupdater
2016-08-10 01:35:22 +09:00
Allofich
67f31d948e
Add removeTexture method
2016-08-10 01:11:14 +09:00
Allofich
4b9aff7a03
Glowupdater fix when using shaders
2016-08-10 00:43:14 +09:00
Allofich
9b2cb2fb8c
Cleanups
2016-08-10 00:25:33 +09:00
Allofich
775162ccdf
Rewrite spell glow implementation
2016-08-09 22:56:53 +09:00
Allofich
cad41599cf
Fix travis build error and warnings
2016-08-09 22:56:53 +09:00
Allofich
1910128e9c
Don't remove uniform when spell glow ends
2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb
Minor rewrite, make "open" spells play glow effect
2016-08-09 22:56:53 +09:00
Allofich
e132b52a69
Handle spell glows within updatecallback
2016-08-09 22:56:53 +09:00
Allofich
123c626f2d
Add glow when using telekinesis on doors
2016-08-09 22:56:53 +09:00
Allofich
57138b416e
Fix spell glows to only run one at a time
2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40
Make non-actors glow when they cast spells
2016-08-09 22:56:53 +09:00
Allofich
dca7b4beb7
Make non-actors also play spell casting sounds
2016-08-09 22:56:53 +09:00
Marc Zinnschlag
a563a9d336
added missing Q_OBJECT
2016-08-09 10:21:37 +02:00
Marc Zinnschlag
96fd9263bf
Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable'
2016-08-09 10:17:26 +02:00
Aesylwinn
448c9d5a5b
Fix globals not being initialized with a valid type.
2016-08-09 00:17:41 -04:00
scrawl
0bbd715f65
Fix the cloned StateSet not being assigned
2016-08-09 01:13:19 +02:00
scrawl
5190275b37
Merge pull request #993 from mrcheko/pathfinding
...
Pathfinding unification
2016-08-09 00:41:03 +02:00
Aesylwinn
0963adb2f4
Fix pointer being deleted twice.
2016-08-08 14:36:50 -04:00
scrawl
46538b9438
Merge pull request #1011 from devnexen/master
...
Mainly making compilable under OpenBSD.
2016-08-07 20:34:03 +02:00
mrcheko
e2cd87fcc7
fix veritcal aiming
2016-08-07 19:23:08 +03:00
Marc Zinnschlag
aa1ed9b172
Merge remote-tracking branch 'aesylwinn/RenderWater'
2016-08-07 17:03:58 +02:00
scrawl
7b557af885
Merge pull request #1007 from MiroslavR/save-anim-state
...
Save scripted animation state
2016-08-06 20:39:32 +02:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Aesylwinn
16d0580ce8
Fix struct/class mismatch.
2016-08-05 15:39:08 -04:00
Aesylwinn
1f32f1eef5
Add water texture.
2016-08-05 14:55:40 -04:00
Aesylwinn
9454f4f2e7
Use shared water geometry + state generation,
...
Fix water position and render bin,
Fix passed cell parameter being ignored
2016-08-05 13:49:44 -04:00
Aesylwinn
5753f52b47
Move water mesh + simple state generation to components library.
2016-08-05 13:25:05 -04:00
Aesylwinn
3904a24e6c
Add missing include.
2016-08-05 00:30:28 -04:00
Aesylwinn
5674e0da24
Render water in editor.
2016-08-04 23:01:43 -04:00
LohikaarmeHAV
19c74a4d6e
Part two
2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592
First part
2016-08-03 20:20:55 +03:00
lohikaarme
e8ef5c233f
Miss info
2016-08-03 14:24:21 +03:00
lohikaarme
0592d1cdcf
Commnent?
2016-08-03 14:22:25 +03:00
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
2016-08-03 03:52:35 +02:00
lohikaarme
48bcde8cc9
...
2016-08-02 15:41:52 +03:00
LohikaarmeHav
b0cf276cfc
hups
2016-08-02 15:27:40 +03:00
LohikaarmeHav
7cd991107c
Nah
...
Preview seem to not like removing mCamPositionSet and I have do other things.
2016-08-02 15:26:12 +03:00
LohikaarmeHav
c6bc30d6a8
Forgot to remove line and add comment.
2016-08-02 14:27:19 +03:00
LohikaarmeHav
2e6f80688c
Removed debug
2016-08-02 14:10:08 +03:00
LohikaarmeHav
c6ec473280
Camera reset now every time cell object->view is pressed.
2016-08-02 13:46:43 +03:00
scrawl
3374630e7b
Merge pull request #1008 from Internecine/bug3451-invalid-enchantments
...
Fixes Bug 3451 - Invalid Enchantment IDs
2016-08-02 10:14:59 +02:00
Internecine
90735d226d
Replaced Store::find usage with Store::search to remove exception handlers.
2016-08-02 11:43:41 +12:00
Marc Zinnschlag
f32d0121fc
Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts'
2016-08-01 09:57:11 +02:00
Internecine
14165352f6
Added exception handlers when trying to retreive enchantment and magic effect data.
2016-08-01 13:16:42 +12:00
Aesylwinn
f73d60cc73
Make scene controls use configurable speed modifier.
2016-07-31 16:28:03 -04:00
Aesylwinn
bf2ab4ed45
Change the way modifiers are handled so they can be shared.
2016-07-31 16:07:17 -04:00
Aesylwinn
faea33b888
Revert "Change scene controls to more closely match blender as requested"
...
This reverts commit bc7ae70f0b
2016-07-31 05:54:13 -04:00
Aesylwinn
bc7ae70f0b
Change scene controls to more closely match blender as requested
...
in the forums.
2016-07-30 09:53:45 -04:00
Aesylwinn
1cce085fa2
Remove unused headers.
2016-07-29 16:35:43 -04:00
Aesylwinn
2f97d6cffb
Move tool tip processing to ShortcutManager,
...
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2
Change some key binding defaults.
2016-07-29 15:00:58 -04:00
Aesylwinn
3475b83e90
Clean up modifier/shortcut class and handle focus out event,
...
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
2016-07-29 15:00:35 -04:00
Aesylwinn
96a3c278fd
Added shortcuts for loading a cell relative to the camera,
...
Removed Ctl+V binding for "Verify" because that is associated
with paste.
2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6
Add custom page for key bindings.
2016-07-27 19:15:24 -04:00
mrcheko
293a0f768c
use real distance to target to determinate 'ready to attack' state
2016-07-27 23:43:32 +03:00
LohikaarmeHav
f142f9bf86
wtf
2016-07-27 21:37:52 +03:00
Aesylwinn
b685c0ce6c
Add ability to clear shortcut/modifier setting with right click.
2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114
Add modifier setting.
2016-07-27 13:53:33 -04:00
Marc Zinnschlag
63fd1e8df7
Merge remote-tracking branch 'origin/master'
2016-07-27 15:49:11 +02:00
Aesylwinn
b204758be1
More shortcuts.
2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d
Exclude keys not compatible with qt 4
2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b
Remove QShortcut usage,
...
Add a lot of shortcuts,
Remove debug messages
2016-07-27 00:24:16 -04:00
Aesylwinn
08af82e1bd
Switched to an interactive method for key input,
...
Redid text representation for shortcuts
2016-07-26 21:22:31 -04:00
AnyOldName3
20f73f4a32
Relocate escape-related code to new files escape.hpp and escape.cpp.
2016-07-27 00:58:31 +01:00
Aesylwinn
05888e7925
Updated more tool tips to show shortcut configs.
2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150
Fix pathgrid selection mode not being removed from toolbar.
2016-07-25 20:49:28 -04:00
Aesylwinn
051aec2729
Added methods to keep text mentioning shortcuts up to date,
...
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
2016-07-25 20:49:09 -04:00
Aesylwinn
f251c3867d
Redesigned shortcut handler to be capable of dealing with child and
...
parent widgets. This should be the final design change. Also, some
various bug fixes.
2016-07-23 21:23:02 -04:00
Aesylwinn
acdb636935
Qt4 protected signal workaround and signed/unsigned mismatch.
2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c
Changed shortcut design to allow a configurable second output. Also
...
re-added shift for temporarily changing camera speed.
2016-07-22 01:58:17 -04:00
MiroslavR
4a3529488b
Fix possible reference duplication when the refID is modified by a plugin (Bug #3471 )
2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220
Fix moved references disappearing when modified by a plugin
2016-07-22 02:12:03 +02:00
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
2016-07-22 01:59:02 +02:00
Aesylwinn
1b5273f2b7
Finally re-added rendering stats, refactored some functions
...
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
2016-07-20 15:00:00 -04:00
AnyOldName3
59639e3988
Make it build again (but remove the new functionality).
2016-07-20 15:16:53 +01:00
Aesylwinn
faa84e0a35
- Further extended usage of new shortcut class
...
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
2016-07-20 08:25:11 -04:00
Aesylwinn
d8fa3fd1de
Added orbit "center on selection" shortcut.
2016-07-20 08:25:11 -04:00
Aesylwinn
e8626e588a
Changes in shortcut design.
...
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839
Remove use of c++11 feature and add some missing headers.
2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0
Base key config/shortcut implementation
2016-07-20 08:25:11 -04:00
AnyOldName3
95d2c7ea5c
Attempt to unescape characters when constructing file paths, introducing compilation errors.
2016-07-20 02:48:57 +01:00
Marc Zinnschlag
c17e1ca24a
Merge remote-tracking branch 'anyoldname3/ignore-hash-test'
2016-07-19 16:19:28 +02:00
MiroslavR
19a8800d4d
Fix camera distance not getting reset to max value ( Fixes #3473 )
2016-07-17 19:52:12 +02: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
AnyOldName3
f1b5ad5804
Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings.
2016-07-12 17:09:57 +01:00
AnyOldName3
e6f78ae5b7
Switch indentation to spaces to remain consistent with the rest of the project
2016-07-12 01:06:57 +01: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
AnyOldName3
1a0642f1db
Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing
2016-07-11 22:33:15 +01:00
mrcheko
8d4f0660ce
fix hardcoded melee attack ranges
2016-07-12 00:17:43 +03:00
AnyOldName3
195dd27780
Resolve obvious runtime error revealing more subtle one
2016-07-11 22:05:38 +01:00
AnyOldName3
fbe6dc9704
Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++
2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c
Trim unneeded code
2016-07-12 04:17:08 +09:00
AnyOldName3
2a9b12bb3f
Fix an issue preventing compilation, revealing another that doesn't make much sense.
2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776
Remove a compilation error and set up framework to remove the others
2016-07-11 01:59:16 +01:00
AnyOldName3
e17e354e84
Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors
2016-07-11 01:16:32 +01: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
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
MiroslavR
b0fcad4cb8
Don't stack effects for scrolls of the same type ( Fixes #3466 )
2016-07-10 03:49:09 +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
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
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
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
Allofich
c02695e56d
Cleanups and fixes
2016-07-04 16:06:16 +09:00
Allofich
199607423b
Use iMaxActivateDist for AI actors that use Activate packages
2016-07-04 16:06:16 +09:00
Allofich
64d298d2b5
Use raycast distance when player activates trapped object
2016-07-04 16:06:15 +09:00
Allofich
64d53a2314
Avoid double raycasts when using getFacedObject
2016-07-04 16:06:04 +09:00
Allofich
574e40db5e
Don't allow telekinesis on activators
2016-07-04 01:50:47 +09:00
scrawl
343dccdbcc
Merge pull request #980 from scrawl/voice_fix
...
Voice fix
2016-07-02 21:55:46 +02:00
scrawl
d96e49c04a
Do not set change flag when running forEach on an empty cell
2016-07-02 20:44:14 +02:00
scrawl
8f62ea2e80
Fix for "RigGeometry rendering with no skeleton" errors
2016-07-02 20:19:55 +02:00
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
2016-07-02 19:48:11 +02:00
scrawl
96757a3b7c
Fix non-predefined cells not being saved correctly
2016-07-02 19:43:08 +02:00
MiroslavR
c8b61cb234
Cache magic effects in MWMechanics::Spells
2016-07-02 12:50:00 +02:00
MiroslavR
700dde116e
Show remnant corprus effects in magic window
2016-07-02 05:17:24 +02:00
MiroslavR
54f52f7bae
Implement effect removal for abilities ( Fixes #3455 )
2016-07-01 18:50:28 +02:00
scrawl
252b27f0ef
Remove getEyePos()
2016-07-01 15:04:59 +02:00
Allofich
b29e9e9c77
Don't allow telekinesis on actors or teleport doors
2016-07-01 02:27:20 +09:00
MiroslavR
72d2daae90
Fix InventoryStore::purgeEffect being reverted by the next recalculation of mMagicEffects
2016-06-29 22:54:11 +02:00
scrawl
528de956da
Merge pull request #981 from Allofich/magicka
...
Fix timing of some magicka calculations
2016-06-29 20:42:18 +02:00
Allofich
2290346296
Fix timing of some magicka calculations
2016-06-30 02:59:09 +09:00
scrawl
5eb6c548d7
Merge pull request #965 from kpp/find_tinyxml
...
Find tinyxml
2016-06-28 02:51:51 +02:00
scrawl
509e5dfe4d
Include cleanup
2016-06-27 22:10:30 +02:00
scrawl
4699a8098b
Include fix
2016-06-27 21:51:18 +02:00
scrawl
1739351b7a
Remove now unused Sound_Decoder::rewind()
2016-06-27 21:38:04 +02:00
scrawl
dc1b010cf0
Don't analyze the loudness for sounds that don't need it
2016-06-27 21:37:13 +02:00
scrawl
965aaebbdb
Analyze the loudness data as the stream is decoded for playback
...
Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.
The benefit is that we need to decode the audio just once instead of twice.
We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
2016-06-27 21:32:54 +02:00
scrawl
fc293aa048
Merge pull request #978 from Allofich/fatigue
...
Fix update of fatigue display
2016-06-27 17:05:05 +02:00
scrawl
5d9f611869
Merge pull request #979 from MiroslavR/master
...
Show correct class image in level-up dialog
2016-06-27 16:58:50 +02:00
Allofich
1602eb3de8
Fix so that keepPlayerAlive() will not run twice
2016-06-27 21:43:49 +09:00
Allofich
19a20a6871
Fix update of fatigue display
2016-06-27 21:17:06 +09:00
MiroslavR
7244809c4a
Remove redundant part of condition
2016-06-26 15:17:52 +02:00
Marc Zinnschlag
594444a85a
Merge remote-tracking branch 'aesylwinn/MultipleDeletion'
2016-06-26 08:11:43 +02:00
MiroslavR
0db3af1b89
ESSImporter: load specialization increases
2016-06-26 03:28:13 +02:00
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
2016-06-26 03:22:58 +02:00
Allofich
dc468dd139
Fix magicka and fatigue calculations from fortifying attributes
2016-06-25 19:21:49 +09:00
Allofich
5d3aebd04b
Update disposition check between persuasion attempts
2016-06-22 01:47:09 +09:00
terrorfisch
be25e2ba75
Make NPCs use both hands in weaponless combat.
2016-06-20 10:24:51 +02:00
Allofich
b1be3596dc
Cleanup of #include statements
2016-06-18 10:56:28 +09:00
Allofich
4a38fb8650
Use namespace block in aiactivate
2016-06-17 20:59:37 +09:00
scrawl
f549b5fb7a
Add missing include
2016-06-17 04:34:31 +02:00
scrawl
c18de84798
Fix a crash that could occur when two or more plugins move a deleted ref to another cell ( Fixes #3446 )
2016-06-17 02:27:49 +02:00
scrawl
3ce63c3f6e
Merge pull request #967 from Allofich/AIPackageFixes
...
AI package cleanups
2016-06-16 20:22:51 +02:00
Allofich
c2b51112f2
AI package cleanups
2016-06-16 17:17:56 +09:00
scrawl
693d3cea4a
Float to surface fix
2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07
Split refreshCurrentAnims into multiple functions
2016-06-15 03:14:44 +02:00
scrawl
372f2e2f18
Merge pull request #962 from Allofich/AIPackageFixes
...
Duration fixes for Follow and Escort
2016-06-14 20:47:32 +02:00
Allofich
3bebbab78e
Duration fixes for Follow and Escort
2016-06-15 02:11:30 +09:00
scrawl
3ec4ee6290
Make a copy of map key to work around it being invalidated ( Fixes #3329 )
2016-06-13 02:06:44 +02:00
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
scrawl
4acfe1a7e4
Move cleanupSummonedCreature to the mechanics manager (Bug #3439 )
2016-06-12 02:43:33 +02:00
scrawl
910ad76e29
Remove spell effects when a summoned creature expires (Bug #3439 )
2016-06-12 00:41:13 +02:00
scrawl
b7e45b046d
When a summoned creature dies, wait for its death animation to complete before removing it (Bug #3439 )
2016-06-12 00:40:55 +02:00
scrawl
a825882c6b
Process death events at the end of the death animation ( Fixes #1873 )
2016-06-12 00:04:50 +02:00
scrawl
37afe966cf
Update comment
2016-06-11 21:25:40 +02:00
scrawl
b6230bd31f
Reject weather dialogue conditions when in an interior cell ( Fixes #3437 )
2016-06-11 18:26:20 +02:00
scrawl
844cbc5a14
Add isNullAction() method to fix compiler warning
2016-06-11 18:26:20 +02:00
scrawl
7a30ef5cc1
Do not consider actors following the player as hostiles
2016-06-11 18:26:20 +02:00
Marc Zinnschlag
148f2c9539
Merge remote-tracking branch 'aesylwinn/QTimerFix'
2016-06-11 11:26:14 +02:00
scrawl
a85932a62b
Ignore the collision box offset when launching projectiles ( Fixes #3201 )
2016-06-10 23:47:01 +02:00
scrawl
c6601ab2ab
Do not use the collision box offset for combat hit tests ( Fixes #3201 )
2016-06-10 23:47:01 +02:00
scrawl
8fcc1911d9
Use fCombatDistance as the creature attack range
2016-06-10 23:47:01 +02:00
Aesylwinn
f6c3b44cfb
Fix QTimer not being stopped in right thread
2016-06-10 12:10:14 -04:00
Daniel Pettersson
943d9d97dc
Slowfall now stops momentum when jumping
2016-06-10 15:22:12 +02:00
scrawl
a00e4de5c3
Fix another bug related to vanity mode toggle
2016-06-10 01:44:32 +02:00
scrawl
c47a679ac9
Fix queueing of vanity mode toggle (Bug #3421 )
2016-06-10 01:39:37 +02:00
scrawl
ce91637cf9
Do not use/assign the camera distance in first person mode ( Fixes #3421 )
2016-06-10 01:05:43 +02:00
scrawl
166cced22f
Merge pull request #957 from svaante/master
...
Added 1.5 bonus for ranged weapons when weapons are rated
2016-06-10 00:01:05 +02:00
scrawl
a14f1bc222
Merge pull request #954 from Allofich/AIWanderDuration
...
Improve duration calculations in Wander AI
2016-06-09 23:46:37 +02:00
Aesylwinn
ae50300053
Add ability to remove multiple rows in subrecords.
2016-06-09 15:42:40 -04:00
Allofich
55ac1fab68
Change Wander duration to run on a counter
2016-06-10 04:36:18 +09:00
Daniel Pettersson
256439f884
Added 1.5 bonus for ranged weapons when weapons are rated
2016-06-09 21:23:36 +02:00
Marc Zinnschlag
3dce406829
Merge remote-tracking branch 'aesylwinn/FixFocus'
2016-06-09 08:57:05 +02:00
scrawl
abcd2219e8
Ignore the calling actor in getEnemiesNearby / getActorsFighting
2016-06-08 22:13:21 +02:00
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
2016-06-08 13:25:47 -04:00
Marc Zinnschlag
447ba08be5
Merge remote-tracking branch 'aesylwinn/FixTracking'
2016-06-08 09:23:35 +02:00
scrawl
165f048792
Do not count dead NPCs as observers ( Fixes #3434 )
2016-06-07 22:01:44 +02:00
Aesylwinn
7657684dad
Fix mouse tracking to fix tooltip behavior. Also hide tooltips
...
when the mouse is moved.
2016-06-07 13:22:39 -04:00
scrawl
12eea9ed69
Remove magic number in getMaxActivationDistance
2016-06-07 15:18:36 +02:00
Marc Zinnschlag
b079db7913
Merge remote-tracking branch 'aesylwinn/EditPathgrid'
2016-06-07 08:35:16 +02:00
scrawl
8fb8c2bae5
Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order
2016-06-07 02:43:25 +02:00
scrawl
f417d7780a
Fix the enemy nearby check (Bug #3423 )
2016-06-07 01:55:34 +02:00
scrawl
dfc2f3469a
Don't play music if no playlist is set
2016-06-07 01:36:09 +02:00
scrawl
f64bc3c7ef
Pass the victim to commitCrime on pickpocket detection ( Fixes #3424 )
2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728
Fix crash in race dialog when no head or hair are available
2016-06-06 01:04:14 +02:00
scrawl
a45643f150
Merge pull request #949 from Allofich/master
...
Fix return values for AITravel
2016-06-05 21:16:28 +02:00
Allofich
065d6a391d
Don't repeat sequences of only one non-wander AI
2016-06-06 04:12:49 +09:00
scrawl
2ee414abe4
Merge pull request #943 from kpp/find_bullet
...
Find bullet
2016-06-05 16:02:34 +02:00
Aesylwinn
3409d8a922
Change pathgrid node movement to be visually consistent, some
...
renaming
2016-06-04 12:38:17 -04:00
Ben Shealy
5085afa3d7
Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading
2016-06-04 12:28:47 -04:00
scrawl
3645b3357e
Fix improper assignement of spawn point in placeAt for non-actors (Bug #3417 )
2016-06-02 21:24:19 +02:00
scrawl
ab2089bbf3
Throw an exception if placeAt is passed an invalid direction parameter
2016-06-02 21:19:02 +02:00
scrawl
2ce1da688f
ESS-Import: fix handling of first person camera state (Bug #3416 )
2016-06-02 16:26:17 +02:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
Aesylwinn
83c86cd1be
Implement context-select functionality.
2016-05-29 13:26:48 -04:00
Aesylwinn
b83f522ecd
Changes to color scheme, slight change to drag indicator,
...
change tooltip description.
2016-05-29 13:26:29 -04:00
Allofich
bce66c629a
Change editor-placed AI packages to cycle
2016-05-29 17:34:40 +09:00
scrawl
496cb85b01
Do not cancel Ai packages when on loading ( Fixes #3409 )
...
This piece of code was an attempt to fix up save games made before commit d3b76b7006
2016-05-28 20:27:05 +02:00
Aesylwinn
90620081c7
Fix handling of deleted pathgrids.
2016-05-27 13:15:35 -04:00
Aesylwinn
bded4f86f0
Remove connection number check
2016-05-27 13:13:49 -04:00
scrawl
d487007167
Remove debug code
2016-05-27 17:43:36 +02:00
scrawl
e396e6f2ea
Adjust the eye level for line of sight checks ( Fixes #3407 )
2016-05-27 17:42:17 +02:00
Aesylwinn
ded8862e9d
Insert nested rows after selected row, or at start if none selected.
2016-05-26 22:44:02 -04:00
Aesylwinn
d0ef95a1e1
Make adjustments to pathgrid modification code.
2016-05-26 22:13:47 -04:00
Aesylwinn
564d0db68c
Move pathgrid abstraction handling to save code.
2016-05-26 22:11:27 -04:00
Aesylwinn
239727531f
Revert "Fix data corruption issues."
...
This reverts commit 6199663bd8
2016-05-25 22:53:17 -04:00
Aesylwinn
9a567b3712
Revert "Fix editor undo for nested data."
...
This reverts commit 774e1497b6
2016-05-25 22:52:41 -04:00
Aesylwinn
ec90da731c
Redo slight change to pathgrid editing controls, lost in revert
2016-05-25 22:52:02 -04:00
Aesylwinn
bb81e89c08
Revert "Cleanup and slight change to pathgrid editing controls."
...
This reverts commit cc4655e9c7
2016-05-25 22:48:43 -04:00
scrawl
a2153a6213
Remove outdated comment
2016-05-25 21:41:05 +02:00
scrawl
5d4f58c828
Fix being unable to activate objects when scripts are disabled
...
The if statement was a leftover of the previous activate implementation and is no longer needed.
2016-05-25 21:37:56 +02:00
Aesylwinn
cc4655e9c7
Cleanup and slight change to pathgrid editing controls.
...
Now that there is a drag indicator, it is easy to tell if an
operation is active or not.
2016-05-24 18:19:05 -04:00
