Commit Graph

12920 Commits (9c56ecac770dd22e107917840f59777b437d7b48)

Author SHA1 Message Date
Assumeru a72cd896ca Move actors out of the water if there's room for them. Fixes #1138 8 years ago
MiroslavR cd9de94c0c Import teleporting and levitation disabled state from vanilla savegames (Fixes #3420) 8 years ago
MiroslavR f3ce0840be Import controls state from vanilla savegames 8 years ago
MiroslavR 301dd77efb Save controls state (Fixes #3598) 8 years ago
MiroslavR 407abc605f Fix auto-equipping of blunt weapons 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
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
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 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
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
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 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 50bcb65ee0 Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms 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 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
Allofich 53e94b7c3f Fix shadowing warnings 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
MiroslavR a05649e1d5 Use loop fallback for movement animations (Fixes #3578) 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
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
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
scrawl 4791fadb9a Merge pull request #1078 from MiroslavR/hidden-items
Do not show uncarriable lights in item views
8 years ago
Aesylwinn b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 8 years ago
scrawl dc07885d25 Merge pull request #1069 from Allofich/combat
Add unarmed attack selection to chooseBestAttack()
8 years ago
MiroslavR 52e00f5fef Do not show uncarriable lights in item views 8 years ago
Rob Cutmore 829345257c Allow disabled nested tables to be scrollable 8 years ago
Allofich 0582f2d918 Adjust touch spell/telekinesis interaction 8 years ago
Allofich 0c603e986d Don't play touch spell explosions on non-activatable statics 8 years ago
Allofich eecf412b85 Recreate vanilla-like behavior for telekinesis and touch spells 8 years ago
Allofich 04c13ffab3 Add unarmed attack selection to chooseBestAttack() 8 years ago
scrawl 8379291f70 Merge pull request #1072 from Allofich/range
Give "on touch" spells same range as vanilla MW
8 years ago
Allofich 37cc4e9efe Don't play area vfx for 0-area touch spells that hit non-actors 8 years ago
Allofich 563ae479e8 Give "on touch" spells same range as vanilla MW 8 years ago
scrawl c6ef26ba4b Merge pull request #1070 from mrcheko/pathfinding
fix using potion as weapon
8 years ago
mrcheko 229cb4b386 remove dynamic_cast to ActionPotion 8 years ago
mrcheko 48765f2ff2 fix using potion as weapon 8 years ago
scrawl 718178bfe9 Merge pull request #1066 from MiroslavR/setinvisible
Don't use base invisibility magnitude for setting alpha
8 years ago
Allofich 7e3cca6d37 Vfx after Divine/Almsivi intervention should be attached to player 8 years ago
Allofich d1157b3e10 Use correct vfx for teleport spells 8 years ago
MiroslavR 744667e163 Don't use base invisibility magnitude for setting alpha (Fixes #3555) 8 years ago
scrawl cd4b182091 Merge pull request #1051 from Allofich/textures
Use spell effect particle textures
8 years ago
Allofich a8e9f2df67 Cleanup 8 years ago
scrawl 30d5c7488d savegamedialog: don't reset the character selection scrollbar when a character is deleted 8 years ago
scrawl 8520b97b37 Merge pull request #1062 from stil-t/master
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
8 years ago
scrawl 7bd445fb83 Don't crash if FontManager::getByName returns NULL (Fixes #3552) 8 years ago
Mikhail Korolev 7e2fe77836 apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles 8 years ago
scrawl 7bbdeb5f85 Merge pull request #1061 from MiroslavR/nameless-actors
Allow activating actors without a name
8 years ago
MiroslavR f323f231db Allow activating actors without a name (Fixes #3551) 8 years ago
Allofich 5aad1d81f4 Remove no longer used parameter 8 years ago
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.
8 years ago
Allofich 322a0ba8bb Initialize speed for magic projectiles 8 years ago
Allofich 7eb62b5d3a Initialize speed for magic projectiles 8 years ago
Allofich dc8ff5e49b Play all sfx and use particle textures for permanent enchantments 8 years ago