Allofich
6fa0354a17
Make AI attack player also if it attacks follower
2016-12-26 22:42:45 +09:00
Allofich
5a6ea4e84e
Cleanup
2016-12-26 22:42:44 +09:00
Allofich
e10c4d8814
Stop combat between AI when canFight is false
2016-12-26 22:42:42 +09:00
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 .
2016-12-26 02:14:01 +09:00
Allofich
588442b6cc
Make enemies start combat with player followers
...
Recreates vanilla behavior of enemies starting combat with player
followers and escorters. (Fixes #3691 )
2016-12-26 02:13:54 +09:00
scrawl
fc47e2e66d
Merge pull request #1176 from nikolaykasyanov/switch-to-xcode8
...
[macOS] Switch CI to Xcode 8.2
2016-12-25 01:34:14 +01:00
scrawl
761472f6f1
Merge pull request #1177 from MiroslavR/essimporter-enam
...
ESSImporter: Convert last known exterior cell
2016-12-25 01:33:57 +01:00
MiroslavR
c2b491cd70
ESSImporter: Convert last known exterior cell ( Fixes #3693 )
...
+ some research
2016-12-24 18:30:39 +01:00
Nikolay Kasyanov
a0990e5899
[macOS] Switch CI to Xcode 8.2
2016-12-24 16:05:24 +01:00
scrawl
cf47299723
Merge pull request #1175 from MiroslavR/pcrank-condition
...
Fix for "PC Rank" info condition
2016-12-24 13:10:46 +01:00
MiroslavR
5f234f8952
Dialogue: "PC Rank" condition now uses speaker's faction if "PC Faction" is not given ( Fixes #3689 )
2016-12-23 19:03:59 +01:00
scrawl
cf496287f7
Silence static analysis warnings
2016-12-22 14:43:54 +01:00
scrawl
dc1f788cff
Use osg::PI over M_PI
2016-12-21 16:49:37 +01:00
scrawl
44ca881614
Merge pull request #1169 from nikolaykasyanov/fix-macos-ci
...
Reenable macOS CI
2016-12-19 12:09:03 +01:00
Nikolay Kasyanov
2967fbdf4c
[CI] Fix email notification configuration
2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
37c8a36dd8
[macOS] Parametrize Qt5 version used on CI
2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
525af97ffc
[macOS] Use newer Xcode version on CI
2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
9b74adbb2c
[macOS] Reenable CI
2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
6d8d9e5dbc
[macOS] Take Qt prefix path from Homebrew for CI resilience
...
Recent CI failure was caused by path changed by Homebrew.
2016-12-18 18:22:43 +01:00
scrawl
465ff1ffd6
Merge pull request #1168 from MiroslavR/essimporter-mark
...
ESSImporter: Import mark location
2016-12-18 15:17:39 +01:00
MiroslavR
cd13570230
ESSImporter: Import mark location
2016-12-18 04:37:59 +01:00
scrawl
6140768783
Enable waterCollision after moving the player above water ( Fixes #3672 )
2016-12-17 23:21:33 +01:00
scrawl
340bc2c1b0
Merge pull request #1164 from Aussiemon/emptypathfix
...
Added check to prevent attempted wandering of empty paths
2016-12-17 19:08:55 +01:00
scrawl
d7f01b499d
Merge pull request #1167 from lkrieg/sdl_event_0x304_fix2
...
Handle SDL event 0x304 by doing nothing (#3670 )
2016-12-17 14:15:53 +01:00
Leon Krieg
170e723cc7
Handle SDL event 0x304 by doing nothing ( #3670 )
2016-12-17 12:51:11 +01:00
scrawl
ebfbd88e7d
Merge pull request #1166 from OpenMW/revert-1165-sdl_event_0x304_fix
...
Revert "Handle SDL event 0x304 by doing nothing (#3670 )"
2016-12-17 12:04:14 +01:00
scrawl
63e093bcd0
Revert "Handle SDL event 0x304 by doing nothing ( #3670 )"
2016-12-17 12:04:03 +01:00
scrawl
21897e493e
Merge pull request #1165 from lkrieg/sdl_event_0x304_fix
...
Handle SDL event 0x304 by doing nothing (#3670 )
2016-12-17 12:02:39 +01:00
Leon Krieg
c2d6e074c2
Handle SDL event 0x304 by doing nothing ( #3670 )
2016-12-17 11:52:17 +01:00
scrawl
eae35af13d
Check if the bounding box changed before calling dirtyBound()
2016-12-17 00:23:22 +01:00
Aussiemon
2f66b91ac5
Added check to prevent attempted wandering of empty paths
2016-12-16 15:18:28 -07:00
scrawl
2b2a51d3b2
Update AUTHORS.md
2016-12-16 20:50:50 +01:00
scrawl
913a8fe1bd
Merge pull request #1160 from Aussiemon/actorupdatecollision
...
[Do not merge yet] Added check before attempting to remove actor's collision object
2016-12-16 20:46:00 +01:00
scrawl
aafff1deb6
Fix memory leak
2016-12-16 20:40:15 +01:00
Aussiemon
b794aa7c2f
Helper methods for updateCollisionMask(), prevent water collision being removed twice, remove Bullet 2.8.5 methods
2016-12-16 12:22:07 -07:00
scrawl
f8690dcd20
Set the drag-and-drop state after initiating the drag, not before ( Fixes #3134 )
2016-12-16 20:16:59 +01:00
scrawl
cca75499ee
Clear the Skeleton's bone cache when a node is added/removed ( Fixes #3663 )
2016-12-16 20:09:20 +01:00
Marc Zinnschlag
34389e15cd
Merge remote-tracking branch 'origin/master'
2016-12-16 12:28:22 +01:00
Marc Zinnschlag
827c78a4cd
added text column to ref id table (books)
2016-12-16 12:28:09 +01:00
scrawl
f97be48bf4
Merge pull request #1162 from lkrieg/death_collision_fix
...
Disable NPC collision only when death animation has finished (#3666 )
2016-12-15 22:45:49 +01:00
scrawl
c0faeea938
RigGeometry check if mesh has normals ( Fixes #3667 )
2016-12-15 22:39:21 +01:00
Leon Krieg
12c8c3276a
Disable NPC collision only when death animation has finished ( #3666 )
2016-12-15 19:33:14 +01:00
scrawl
81b9b07820
Merge pull request #1161 from Aussiemon/sdlfix
...
[Bug #2771 ] Handle SDL event 0x302 by doing nothing
2016-12-15 16:10:52 +01:00
scrawl
0168c55c2d
Merge pull request #1159 from lkrieg/spelling_fixes
...
More spelling fixes
2016-12-15 16:10:25 +01:00
Leon Krieg
739cd5ba45
Fixed more spelling mistakes
2016-12-15 13:09:40 +01:00
Aussiemon
369272fc70
Handle SDL event 0x302 by doing nothing
2016-12-14 21:08:20 -07:00
Aussiemon
7c2a088b34
Added check before removing water collision object from world
2016-12-14 20:13:23 -07:00
Aussiemon
e30dfb13d3
Added check before attempting to remove actor's collision object from world
2016-12-14 19:05:30 -07:00
scrawl
2eb6ef50ca
Revert "[OS X] Reenable CI"
...
This reverts commit c99d9a47e8
2016-12-14 20:03:42 +01:00
scrawl
e6332d7c12
Merge pull request #1157 from lkrieg/spelling_fixes
...
Multiple spelling fixes
2016-12-14 17:56:51 +01:00
