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
Ryan Tucker
15cdc06162
Finished transferring settings guide from wiki
2016-12-21 22:04:52 -08:00
Ryan Tucker
6429a610ff
Merge branch 'master' of https://github.com/OpenMW/openmw
2016-12-21 20:52:47 -08:00
logzero
50fd913058
Refactor stepMove function into a Stepper object
...
to be able to reuse up stepper results
for successive movement solver iterations.
This can reduce the number of convex casts
almost by half in some cases.
2016-12-21 19:02:42 +01:00
logzero
4f6e65e481
Apply sliding upward check to new velocity.
...
This helps to capture the case where new velocity
only differs in the z component (normal pointing up).
TODO: Find a better way to handle the normal pointing up case.
2016-12-21 19:02:42 +01:00
logzero
0b08802910
Integrate MinStep move attempt into stepMove.
...
This can save 1 to 3 convex casts per iteration.
2016-12-21 19:02:41 +01:00
logzero
25a0219e4d
Use cosine of max slope angle for walkable slope checks in movement solver.
2016-12-21 19:02:41 +01:00
logzero
561e0cbbf9
Use squared length for distance checks in movement solver.
2016-12-21 19:02:40 +01:00
scrawl
dc1f788cff
Use osg::PI over M_PI
2016-12-21 16:49:37 +01:00
Koncord
6e6237541a
Fix "comparison between signed and unsigned integer expressions"
2016-12-21 16:13:39 +08:00
Koncord
af7b232789
Fix type mismatch
2016-12-21 15:46:02 +08:00
Koncord
0d9a4f2b6f
Fix "Unhandled PlayerPacket with identifier 135"
2016-12-21 15:01:18 +08:00
Koncord
561a88d441
Fix "comparison between signed and unsigned integer expressions"
2016-12-21 14:46:36 +08: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
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
David Cernat
ab238e07c4
Fix unnoticed merge conflict
2016-12-20 05:25:31 +02:00
David Cernat
bf0a96d552
Merge pull request #114 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
2016-12-20 05:21:24 +02: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
Koncord
efb40b3c66
Remove redundant code
2016-12-18 14:14:52 +08:00
Koncord
11be8ed005
Rename copyOldLog to renameOldLog
2016-12-18 12:48:23 +08:00
Koncord
e44ebca0aa
Keep old client logs
2016-12-18 12:45:03 +08:00
Koncord
f08ab0b161
Keep old server logs
2016-12-18 12:45:03 +08:00
Koncord
f7b4aea85b
add function for keeping old logs
2016-12-18 12:45:03 +08: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
David Cernat
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
2016-12-17 23:27:09 +02: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
