Commit Graph

17031 Commits (14468262a75309b98d9795e781234725aebce9a2)
 

Author SHA1 Message Date
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
scrawl 48f299532c Merge pull request #1096 from Allofich/magic
Don't let Weakness to Magicka affect paralysis
8 years ago
Allofich f6f16b68de Don't let Weakness to Magicka affect paralysis 8 years ago
scrawl 37bfa88b2d Merge pull request #1094 from Allofich/alchemy
Fix reversed use of alembics and retorts
8 years ago
Allofich 498976775a Fix reversed use of alembics and retorts 8 years ago
scrawl 73b6c34a23 Merge pull request #1092 from Allofich/warnings
Fix shadowing warnings
8 years ago
scrawl 0c981b6fe5 Fix typo in script opcode (Fixes #3583) 8 years ago
Allofich 53e94b7c3f Fix shadowing warnings 8 years ago
scrawl 97cd8c21e4 Merge pull request #1091 from Allofich/coverity
Coverity fixes
8 years ago
Allofich df03b32205 Coverity fixes 8 years ago
scrawl 721062a4bd Merge pull request #1089 from Allofich/bound
Corrections for bound equipment
8 years ago
Allofich 506d0e8e54 Correction to display of 0-weight tooltips 8 years ago
Allofich 160da0b149 Treat 0-weight armor as light armor in some respects 8 years ago
scrawl 17455821f6 Merge pull request #1088 from MiroslavR/movement-loopfallback
Use loop fallback for movement animations
8 years ago
MiroslavR a05649e1d5 Use loop fallback for movement animations (Fixes #3578) 8 years ago
scrawl e883528a60 Merge pull request #1087 from sandstranger/gles1_crash_fix
disable using shaders for gles1 and Android
8 years ago
sandstranger 5230bf6528 disable using shaders for gles1 and Android 8 years ago
scrawl 44dffe55ab Merge pull request #1083 from Allofich/onhit
Make AI response to spell hits more like original MW
8 years ago
scrawl 3d76ba5a7c Merge pull request #1086 from Allofich/warnings
Fix shadowing warnings
8 years ago
Allofich 6ec37b5cfb Fix shadowing warnings 8 years ago
Allofich e78f02aaf2 Consider reflected/absorbed hostile spells as assaults 8 years ago
scrawl 933a601e00 Merge pull request #1085 from MiroslavR/interactive-id
Fix interactive ID validity checks
8 years ago
MiroslavR 210c02d98e Fix interactive ID validity checks in TypesetBookImpl 8 years ago
Allofich a81a04e6d0 Remove unused line 8 years ago
Allofich fa17784722 Change breaks to continues 8 years ago
scrawl 140be70a90 Merge pull request #1082 from Gladdy/master
Fix for segmentation fault on entering a cell
8 years ago
scrawl b170efb9fa Merge pull request #1084 from Allofich/water
Don't let water-only creatures prevent resting
8 years ago
Allofich a2e174a40f Don't let water-only creatures prevent resting 8 years ago
Allofich 266ec1aadc Make AI response to spell hits more like original MW 8 years ago
Marc Zinnschlag e918474a94 Merge remote-tracking branch 'rcutmore/bug-3277' 8 years ago
Rob Cutmore 8f47ed17df Show nested tables only when they are editable 8 years ago
Martijn Bakker 45ffdbb284 fixed a segmentation fault when entering a cell which contains someone already attacking you 8 years ago
scrawl 85c7d014d3 Use a shader to render the simple water, ensuring that fog is applied per pixel (Fixes #2716) 8 years ago
scrawl 0cf837aa20 Merge pull request #1081 from psi29a/armhf
make BUILD_OPENCS a dependency for building osgQt
8 years ago
Bret Curtis 55fb33670c Make building osgQt dependant on building openmw-cs 8 years ago
Rob Cutmore b59694c4f0 Set tooltip for read-only nested tables 8 years ago
Marc Zinnschlag eaeaae3243 Merge remote-tracking branch 'aesylwinn/FixRefIdData' 8 years ago