scrawl
c326564e20
Merge pull request #1136 from Allofich/deletespell
...
Allow deleting spells that have the "always succeeds" flag
2016-11-20 19:23:25 +01:00
scrawl
16a913c549
Add emission of water ripple particles for water-walking actors ( Fixes #3608 )
2016-11-20 18:47:12 +01:00
Allofich
c82df2553c
Allow deleting spells that have the "always succeeds" flag ( Fixes #3627 )
2016-11-21 02:26:02 +09:00
scrawl
385db50f2d
Merge pull request #1131 from Allofich/waterwalking
...
Make water walking mechanics closer to original MW
2016-11-20 17:19:15 +01:00
MiroslavR
c1e52bbcf7
Fix -Wmismatched-tags clang warning
2016-11-20 15:10:37 +01:00
Allofich
0e429ae41d
Make water walking mechanics closer to original MW
2016-11-20 22:21:33 +09:00
scrawl
f51e06bc47
Recreate shaders if necessary when the NpcAnimation is rebuilt
...
This fixes certain equipment losing the 'invisibility' effect after a view-mode switch with shaders enabled. Because the initial build of shaders done by the resource manager is not aware of the override state in the NpcAnimation's object root, we have to build new shaders here.
2016-11-19 23:53:22 +01:00
scrawl
e823cbf018
Fix incorrect priority of animation sources (Bug #3626 )
2016-11-19 23:53:22 +01:00
MiroslavR
8f91732b09
Show starting abilities, powers and spells in stat-review window ( Fixes #2410 )
2016-11-19 21:51:19 +01:00
MiroslavR
7e5ba4d435
Fix default values of some GMSTs
2016-11-17 19:43:02 +01:00
scrawl
9d125bcaa2
Merge pull request #1129 from PhillipAnd/phillipand-cmake-fix
...
Fix various build issues with Visual Studio environment
2016-11-17 18:25:23 +01:00
scrawl
2368382ea5
Fix upside down rain particle texture
2016-11-17 17:52:20 +01:00
MiroslavR
5e46121046
Implement fleeing AI ( Closes #1118 )
2016-11-16 20:15:25 +01:00
Phillip Andrews
c18fc113e5
Changed missing library dependencies to simple fix
2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
2016-11-13 22:49:01 -06:00
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
2016-11-13 16:59:36 -06:00
Phillip Andrews
86b4673539
Removed math constants in openmw-cs, which are apparently not going to be used
2016-11-13 16:43:07 -06:00
Phillip Andrews
a1225ff4ec
Additional MSVC library dependencies
2016-11-13 14:34:12 -06:00
Phillip Andrews
1861302dbd
Include various libraries for Visual Studio environment
2016-11-13 14:27:59 -06:00
scrawl
02b9e81f89
Merge pull request #1127 from Allofich/warnings
...
Fix shadowing warnings
2016-11-13 20:49:26 +01:00
MiroslavR
175cfd4dff
Fix overloaded virtual function warning
2016-11-13 17:22:50 +01:00
Allofich
3420121c3f
Fix shadowing warnings
2016-11-13 23:20:51 +09:00
Allofich
fee39afe38
Don't allow resting on water with water walking
2016-11-13 19:50:33 +09:00
scrawl
f0d5cf7afb
Merge pull request #1112 from Assumeru/waterwalking
...
Move actors out of the water if there's room for them. Fixes #1138
2016-11-10 19:02:51 +01:00
Assumeru
05cc258ed3
Start trace from collision object origin
2016-11-10 15:38:14 +01:00
Assumeru
99bc4f733f
Trace up to waterlevel + halfextent
2016-11-09 18:03:10 +01:00
scrawl
92d42ef49b
Merge pull request #1123 from Allofich/warnings
...
Fix dereference of null pointer warning
2016-11-07 22:22:32 +01:00
Allofich
c7313606f5
Fix dereference of null pointer warning
2016-11-07 22:39:20 +09:00
MiroslavR
e80636f0ca
Improve performance of repairing/recharging ( Fixes #2493 )
2016-11-06 11:01:46 +01:00
Nikolay Kasyanov
3adf4cb97f
Link OpenMW with libz on macOS
2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874
Revert "Link OpenMW with libz on macOS"
...
This reverts commit 0c4dd05118
2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118
Link OpenMW with libz on macOS
2016-11-05 12:09:47 +01:00
scrawl
d8b506155e
Merge pull request #1118 from MiroslavR/resize-perf
...
Fix horrible performance when resizing/moving the settings window
2016-11-04 20:24:27 +01:00
Nikolay Kasyanov
5d4734c02e
Use local path from configuration manager to load openmw.cfg in launcher
2016-11-01 21:27:35 +01:00
MiroslavR
5cd04af3fa
Fix horrible performance when resizing/moving the settings window
...
Resize widgets instead of reconstructing them.
2016-11-01 16:37:00 +01:00
scrawl
e0f613661e
Fix char -> int, fix shadowing warning
2016-10-30 20:10:33 +01:00
scrawl
cac8de0b29
Merge pull request #1116 from Allofich/paused
...
Don't update ripple simulation when paused
2016-10-30 19:26:56 +01:00
scrawl
e5cb7306c3
Merge pull request #1115 from Allofich/conversion
...
Fix narrowing conversion warning
2016-10-30 19:26:51 +01:00
Allofich
19db070fca
Don't update ripple simulation when paused
2016-10-31 01:19:38 +09:00
Allofich
68ed264f40
Fix narrowing conversion warning
2016-10-31 00:53:17 +09:00
Allofich
125e94ef0e
Fix shadowing warnings
2016-10-31 00:39:31 +09:00
Assumeru
25d64989b3
Check if the actor still exists /first/
2016-10-26 11:04:54 +02:00
Assumeru
a72cd896ca
Move actors out of the water if there's room for them. Fixes #1138
2016-10-25 19:26:17 +02:00
MiroslavR
cd9de94c0c
Import teleporting and levitation disabled state from vanilla savegames ( Fixes #3420 )
2016-10-20 14:38:18 +02:00
MiroslavR
f3ce0840be
Import controls state from vanilla savegames
2016-10-20 02:14:36 +02:00
MiroslavR
301dd77efb
Save controls state ( Fixes #3598 )
2016-10-20 02:12:01 +02:00
MiroslavR
407abc605f
Fix auto-equipping of blunt weapons
2016-10-19 22:37:45 +02:00
scrawl
9c549a85ce
Merge pull request #1108 from MiroslavR/autoequip-weap
...
Auto-equip weapons
2016-10-19 20:45:47 +02:00
MiroslavR
76ddd9bebb
Add a setting for merchant auto-equipping prevention
2016-10-19 02:22:49 +02:00
scrawl
a7d4928593
Properly handle moved references in respawning code ( Fixes #3600 )
2016-10-18 23:51:45 +02:00
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
