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 |
|
Ryan Tucker
|
ec471365f5
|
Merge branch 'master' of https://github.com/OpenMW/openmw
|
2016-12-19 21:24:14 -08:00 |
|
Ryan Tucker
|
0c71fde523
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# docs/source/openmw-mods/index.rst
|
2016-12-19 21:09:34 -08:00 |
|
Ryan Tucker
|
bf805813e5
|
Merge branch 'master' of https://github.com/OpenMW/openmw
# Conflicts:
# docs/source/openmw-mods/index.rst
|
2016-12-19 21:06:36 -08: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 |
|
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 |
|
Leon Krieg
|
c7b4b2cdd7
|
Fixed multiple spelling mistakes
|
2016-12-14 16:39:33 +01:00 |
|
scrawl
|
8bdd5d1131
|
Merge pull request #1151 from Aussiemon/projectilelightsfix
Update to implementation of projectile lights
|
2016-12-14 14:33:09 +01:00 |
|
mrohrlach
|
71e74f5a93
|
Moved projectile light calculation to separate method
|
2016-12-13 18:04:20 -07:00 |
|
Bret Curtis
|
065bf47e38
|
Merge branch 'master' into master
|
2016-12-13 22:07:40 +01:00 |
|
Bret Curtis
|
582acc8c71
|
Merge pull request #1156 from jeffreyhaines/patch-2
Minor grammar and sentence changes
|
2016-12-13 22:05:50 +01:00 |
|