Commit Graph

17248 Commits (e10c4d8814a043a83c6b569c544b41f012407667)
 

Author SHA1 Message Date
Allofich e10c4d8814 Stop combat between AI when canFight is false 8 years ago
Allofich e8c7ad2f4b Change environment check to canFight check
Instead of just checking that combatants are in compatible environments,
allow combat if in attack range using canFight. Together with previous
commit, fixes #3690.
8 years ago
Allofich 588442b6cc Make enemies start combat with player followers
Recreates vanilla behavior of enemies starting combat with player
followers and escorters. (Fixes #3691)
8 years ago
scrawl fc47e2e66d Merge pull request #1176 from nikolaykasyanov/switch-to-xcode8
[macOS] Switch CI to Xcode 8.2
8 years ago
scrawl 761472f6f1 Merge pull request #1177 from MiroslavR/essimporter-enam
ESSImporter: Convert last known exterior cell
8 years ago
MiroslavR c2b491cd70 ESSImporter: Convert last known exterior cell (Fixes #3693)
+ some research
8 years ago
Nikolay Kasyanov a0990e5899 [macOS] Switch CI to Xcode 8.2 8 years ago
scrawl cf47299723 Merge pull request #1175 from MiroslavR/pcrank-condition
Fix for "PC Rank" info condition
8 years ago
MiroslavR 5f234f8952 Dialogue: "PC Rank" condition now uses speaker's faction if "PC Faction" is not given (Fixes #3689) 8 years ago
scrawl cf496287f7 Silence static analysis warnings 8 years ago
scrawl dc1f788cff Use osg::PI over M_PI 8 years ago
scrawl 44ca881614 Merge pull request #1169 from nikolaykasyanov/fix-macos-ci
Reenable macOS CI
8 years ago
Nikolay Kasyanov 2967fbdf4c [CI] Fix email notification configuration 8 years ago
Nikolay Kasyanov 37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 8 years ago
Nikolay Kasyanov 525af97ffc [macOS] Use newer Xcode version on CI 8 years ago
Nikolay Kasyanov 9b74adbb2c [macOS] Reenable CI 8 years ago
Nikolay Kasyanov 6d8d9e5dbc [macOS] Take Qt prefix path from Homebrew for CI resilience
Recent CI failure was caused by path changed by Homebrew.
8 years ago
scrawl 465ff1ffd6 Merge pull request #1168 from MiroslavR/essimporter-mark
ESSImporter: Import mark location
8 years ago
MiroslavR cd13570230 ESSImporter: Import mark location 8 years ago
scrawl 6140768783 Enable waterCollision after moving the player above water (Fixes #3672) 8 years ago
scrawl 340bc2c1b0 Merge pull request #1164 from Aussiemon/emptypathfix
Added check to prevent attempted wandering of empty paths
8 years ago
scrawl d7f01b499d Merge pull request #1167 from lkrieg/sdl_event_0x304_fix2
Handle SDL event 0x304 by doing nothing (#3670)
8 years ago
Leon Krieg 170e723cc7 Handle SDL event 0x304 by doing nothing (#3670) 8 years ago
scrawl ebfbd88e7d Merge pull request #1166 from OpenMW/revert-1165-sdl_event_0x304_fix
Revert "Handle SDL event 0x304 by doing nothing (#3670)"
8 years ago
scrawl 63e093bcd0 Revert "Handle SDL event 0x304 by doing nothing (#3670)" 8 years ago
scrawl 21897e493e Merge pull request #1165 from lkrieg/sdl_event_0x304_fix
Handle SDL event 0x304 by doing nothing (#3670)
8 years ago
Leon Krieg c2d6e074c2 Handle SDL event 0x304 by doing nothing (#3670) 8 years ago
scrawl eae35af13d Check if the bounding box changed before calling dirtyBound() 8 years ago
Aussiemon 2f66b91ac5 Added check to prevent attempted wandering of empty paths 8 years ago
scrawl 2b2a51d3b2 Update AUTHORS.md 8 years ago
scrawl 913a8fe1bd Merge pull request #1160 from Aussiemon/actorupdatecollision
[Do not merge yet] Added check before attempting to remove actor's collision object
8 years ago
scrawl aafff1deb6 Fix memory leak 8 years ago
Aussiemon b794aa7c2f Helper methods for updateCollisionMask(), prevent water collision being removed twice, remove Bullet 2.8.5 methods 8 years ago
scrawl f8690dcd20 Set the drag-and-drop state after initiating the drag, not before (Fixes #3134) 8 years ago
scrawl cca75499ee Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663) 8 years ago
Marc Zinnschlag 34389e15cd Merge remote-tracking branch 'origin/master' 8 years ago
Marc Zinnschlag 827c78a4cd added text column to ref id table (books) 8 years ago
scrawl f97be48bf4 Merge pull request #1162 from lkrieg/death_collision_fix
Disable NPC collision only when death animation has finished (#3666)
8 years ago
scrawl c0faeea938 RigGeometry check if mesh has normals (Fixes #3667) 8 years ago
Leon Krieg 12c8c3276a Disable NPC collision only when death animation has finished (#3666) 8 years ago
scrawl 81b9b07820 Merge pull request #1161 from Aussiemon/sdlfix
[Bug #2771] Handle SDL event 0x302 by doing nothing
8 years ago
scrawl 0168c55c2d Merge pull request #1159 from lkrieg/spelling_fixes
More spelling fixes
8 years ago
Leon Krieg 739cd5ba45 Fixed more spelling mistakes 8 years ago
Aussiemon 369272fc70 Handle SDL event 0x302 by doing nothing 8 years ago
Aussiemon 7c2a088b34 Added check before removing water collision object from world 8 years ago
Aussiemon e30dfb13d3 Added check before attempting to remove actor's collision object from world 8 years ago
scrawl 2eb6ef50ca Revert "[OS X] Reenable CI"
This reverts commit c99d9a47e8.
8 years ago
scrawl e6332d7c12 Merge pull request #1157 from lkrieg/spelling_fixes
Multiple spelling fixes
8 years ago
Leon Krieg c7b4b2cdd7 Fixed multiple spelling mistakes 8 years ago
scrawl 8bdd5d1131 Merge pull request #1151 from Aussiemon/projectilelightsfix
Update to implementation of projectile lights
8 years ago