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

17953 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
David Cernat
2d46b33c5f Removed duplicate team list 2016-12-16 19:42:53 +02:00
David Cernat
b36415465a Tweaked readme and added first draft of real changelog 2016-12-16 19:39:57 +02:00
Stanislav Zhukov
f72bea175a Update README.md 2016-12-17 00:52:58 +08:00
U-VirtualBox-PC\Admin
6229269506 Some patches for lua on windows 2016-12-16 19:04:47 +03:00
David Cernat
35de28e239 Fix setting of longer environmental variables on Windows 2016-12-16 17:57:02 +02: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
Koncord
804259b2c9 Change some printf to LOG_MESSAGE_SIMPLE 
printf is not streamed to files
 2016-12-16 18:50:34 +08:00
Koncord
2eda48acca Fix issue #111 2016-12-16 18:13:44 +08:00
Koncord
f74734cfba Fix server crash if player is not fully connected 2016-12-16 17:53:56 +08:00
Koncord
3ee82a761b Remove redundant include 2016-12-16 17:51:00 +08:00