MiroslavR
301dd77efb
Save controls state ( Fixes #3598 )
8 years ago
scrawl
5580123880
Merge pull request #1109 from MiroslavR/autoequip-weap2
...
Fix auto-equipping of blunt weapons
8 years ago
MiroslavR
407abc605f
Fix auto-equipping of blunt weapons
8 years ago
scrawl
a5ca33ad0b
Disable failing OSX build
8 years ago
scrawl
9c549a85ce
Merge pull request #1108 from MiroslavR/autoequip-weap
...
Auto-equip weapons
8 years ago
MiroslavR
76ddd9bebb
Add a setting for merchant auto-equipping prevention
8 years ago
scrawl
a7d4928593
Properly handle moved references in respawning code ( Fixes #3600 )
8 years ago
MiroslavR
1d3008594d
Autoequip weapons ( Fixes #3562 )
8 years ago
scrawl
77bc807305
Attenuate the light ambient in lighting.glsl ( Fixes #3597 )
8 years ago
scrawl
f0e488e9c5
Merge pull request #1107 from MiroslavR/autoequip
...
Fix autoEquip to better match vanilla
8 years ago
MiroslavR
14240cf7a2
Fix autoEquip to better match vanilla ( Fixes #3590 )
8 years ago
scrawl
1d58733880
Merge pull request #1104 from MiroslavR/missing-weather-states
...
Import base weather states before loading region modifiers
8 years ago
scrawl
460eee9ad1
Merge pull request #1105 from Allofich/warnings
...
Fix shadowing warnings
8 years ago
Allofich
ccacad51be
Fix shadowing warnings
8 years ago
MiroslavR
7b59eda13a
Import base weather states before loading region modifiers ( Fixes #3594 )
8 years ago
scrawl
9e63c3ce63
Merge pull request #1103 from Allofich/warnings
...
Fix shadowing warnings
8 years ago
scrawl
5ccbabc27d
Fix build against bullet with profiler disabled ( Fixes #3592 )
8 years ago
Allofich
1c54f54ab8
Fix shadowing warnings
8 years ago
scrawl
2ed0277839
Merge pull request #1102 from Allofich/spells
...
Change several spell effects from instant to non-instant
8 years ago
scrawl
9d2e0124dc
Revert "Fix the cell changed flag no longer being reset after the player dies"
...
This reverts commit d7acec74fd
.
8 years ago
Allofich
610f36f47b
Set magic effects that don't support variable durations to use duration of 1
8 years ago
Allofich
1c2e04747d
Remove stray line
8 years ago
Allofich
675bd09462
Change several instant effects to be non-instant ( Fixes #2054 )
8 years ago
scrawl
db09858f59
Don't allow the player to activate objects when dead
8 years ago
scrawl
454d1ffaef
Make the cell change check during actor update more robust
8 years ago
scrawl
d7acec74fd
Fix the cell changed flag no longer being reset after the player dies
8 years ago
scrawl
e7154c3f7c
Add the ItemShadow to various other skins
8 years ago
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
8 years ago
scrawl
15046c961b
Merge pull request #1101 from MiroslavR/ignored-light-sources-fix
...
Ignored light sources fix
8 years ago
scrawl
c5eb854157
Merge pull request #1100 from MiroslavR/info-faction-check
...
Recognize special faction ID "FFFF" during topic info verification
8 years ago
MiroslavR
611d02ad43
Remove unused code
8 years ago
MiroslavR
1906d96064
Non-player actors emitting light from a non-portable light item should be illuminated ( Fixes #3588 )
8 years ago
MiroslavR
53b006eccb
OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification ( Fixes #3564 )
8 years ago
scrawl
3dce155d96
Fix uninitialized variable
8 years ago
scrawl
55566f8ec2
Merge pull request #1099 from MiroslavR/notlocal
...
Fix the "Not Local" dialog test
8 years ago
MiroslavR
8be8c7ca66
OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564 )
8 years ago
MiroslavR
14468262a7
Fix "Not Local" dialog test to also test variable value instead of just its existence ( Fixes #3577 )
8 years ago
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
8 years ago
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
8 years ago
scrawl
105fcc5e20
Move the setting of BOOST_COMPONENTS closer to where it's actually used
8 years ago
scrawl
ae2036fa85
Merge pull request #1097 from Allofich/persuasion
...
Don't let intimidate bring disposition below 0 (Fixes #3584 )
8 years ago
Allofich
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
8 years ago
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.
8 years ago
MiroslavR
11565b5966
Make actors with non-portable lights in inventory glow ( Closes #2042 , #3338 )
8 years ago
scrawl
5c94e2324f
Add missing use plugin macro for static build
8 years ago
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
8 years ago
scrawl
b0d4c8740c
Merge pull request #1098 from nikolaykasyanov/osx-missing-plugins
...
[OS X] Add missing plugins to packaging script
8 years ago
Nikolay Kasyanov
4815938de2
[OS X] Add missing plugins to packaging script
...
Source: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OSG_plugins
Issue: https://bugs.openmw.org/issues/3585
8 years ago
scrawl
6615330430
Fix use of UnrefQueue in removeObject
8 years ago
scrawl
3019d70986
Use 'default icon' for items with no icon specified
8 years ago