scrawl
97d7b1a3b8
Update AUTHORS.md
2017-01-01 20:20:02 +01:00
scrawl
212e85e810
Merge pull request #1174 from Allofich/combat
...
Adjustments to AI combat engaging and disengaging
2017-01-01 19:36:09 +01:00
scrawl
da3815f5a6
Merge pull request #1179 from Armada651/fix-audio-cutoff
...
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
2017-01-01 19:13:32 +01:00
Marc Zinnschlag
dedd95f52a
Merge remote-tracking branch 'miroslavr/save-cleanup'
2016-12-29 08:37:59 +01:00
Jules Blok
e9d8ff532f
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
...
This works around a bug in the MacOS OpenAL implementation.
2016-12-29 01:03:13 +01:00
Marc Zinnschlag
41499ea11f
Merge branch 'openmw-41'
2016-12-27 13:35:36 +01:00
MiroslavR
c9dd63af8d
Merge pull request #1171 from NeveHanter/travel-followers-cost
...
Implemented "paying" for travelling followers
2016-12-26 22:34:39 +01:00
NeveHanter
8568cd049f
Removed "less" character from the documentation by the requested opportunity.
2016-12-26 21:46:43 +01:00
Allofich
54fa921dad
Change some AI combat engagements to not need LOS
2016-12-26 22:42:46 +09:00
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
NeveHanter
ff4aba2a6e
Moved duplicated code to common ActionTeleport static method and reordered travel price calculations
2016-12-23 21:27:29 +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
MiroslavR
87fd011a28
Clean-up saves by dropping references with invalid RefNums ( Fixes #1956 )
2016-12-22 20:48:58 +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
NeveHanter
15cd3c178b
Clamp price multiplication to 1, as it resulted in player alone traveling at no fee.
2016-12-20 21:23:55 +01:00
NeveHanter
8902bb5b13
Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith
2016-12-20 12:38:51 +01:00
Marc Zinnschlag
3c89b03568
Merge remote-tracking branch 'origin/openmw-41' into openmw-41
2016-12-19 15:28:49 +01:00
Marc Zinnschlag
9c56ecac77
fixed changelog
2016-12-19 15:28:27 +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
f2f0e9f1e7
Clear the Skeleton's bone cache when a node is added/removed ( Fixes #3663 )
2016-12-17 23:26:33 +01:00
scrawl
b5e8c98b40
Enable waterCollision after moving the player above water ( Fixes #3672 )
2016-12-17 23:26:17 +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