mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 10:19:55 +00:00
Code Issues Releases Wiki Activity
17753 commits 38 branches 54 tags 122 MiB
Commit graph

17753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Koncord
7595b33461 Implement spellbook 2016-12-29 21:19:57 +08:00
David Cernat
fba4878fee Merge pull request #118 from OpenMW/master 
Add OpenMW changes up to 27 Dec
 2016-12-27 03:49:52 +02: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
David Cernat
5bdfb72752 Merge pull request #116 from OpenMW/master 
Add OpenMW changes up to 26 Dec
 2016-12-26 01:09:20 +02: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
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
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
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
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
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
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