Ryan Tucker
|
ec471365f5
|
Merge branch 'master' of https://github.com/OpenMW/openmw
|
8 years ago |
|
Ryan Tucker
|
0c71fde523
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# docs/source/openmw-mods/index.rst
|
8 years ago |
|
Ryan Tucker
|
bf805813e5
|
Merge branch 'master' of https://github.com/OpenMW/openmw
# Conflicts:
# docs/source/openmw-mods/index.rst
|
8 years ago |
David Cernat
|
ab238e07c4
|
Fix unnoticed merge conflict
|
8 years ago |
|
David Cernat
|
bf0a96d552
|
Merge pull request #114 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
|
8 years ago |
Marc Zinnschlag
|
3c89b03568
|
Merge remote-tracking branch 'origin/openmw-41' into openmw-41
|
8 years ago |
|
Marc Zinnschlag
|
9c56ecac77
|
fixed changelog
|
8 years ago |
scrawl
|
44ca881614
|
Merge pull request #1169 from nikolaykasyanov/fix-macos-ci
Reenable macOS CI
|
8 years ago |
Nikolay Kasyanov
|
2967fbdf4c
|
[CI] Fix email notification configuration
|
8 years ago |
|
Nikolay Kasyanov
|
37c8a36dd8
|
[macOS] Parametrize Qt5 version used on CI
|
8 years ago |
|
Nikolay Kasyanov
|
525af97ffc
|
[macOS] Use newer Xcode version on CI
|
8 years ago |
Nikolay Kasyanov
|
9b74adbb2c
|
[macOS] Reenable CI
|
8 years ago |
|
Nikolay Kasyanov
|
6d8d9e5dbc
|
[macOS] Take Qt prefix path from Homebrew for CI resilience
Recent CI failure was caused by path changed by Homebrew.
|
8 years ago |
|
scrawl
|
465ff1ffd6
|
Merge pull request #1168 from MiroslavR/essimporter-mark
ESSImporter: Import mark location
|
8 years ago |
Koncord
|
efb40b3c66
|
Remove redundant code
|
8 years ago |
|
Koncord
|
11be8ed005
|
Rename copyOldLog to renameOldLog
|
8 years ago |
|
Koncord
|
e44ebca0aa
|
Keep old client logs
|
8 years ago |
|
Koncord
|
f08ab0b161
|
Keep old server logs
|
8 years ago |
|
Koncord
|
f7b4aea85b
|
add function for keeping old logs
|
8 years ago |
MiroslavR
|
cd13570230
|
ESSImporter: Import mark location
|
8 years ago |
|
scrawl
|
f2f0e9f1e7
|
Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663)
|
8 years ago |
|
scrawl
|
b5e8c98b40
|
Enable waterCollision after moving the player above water (Fixes #3672)
|
8 years ago |
|
scrawl
|
6140768783
|
Enable waterCollision after moving the player above water (Fixes #3672)
|
8 years ago |
|
David Cernat
|
973db7c78a
|
Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
|
8 years ago |
|
scrawl
|
340bc2c1b0
|
Merge pull request #1164 from Aussiemon/emptypathfix
Added check to prevent attempted wandering of empty paths
|
8 years ago |
|
scrawl
|
d7f01b499d
|
Merge pull request #1167 from lkrieg/sdl_event_0x304_fix2
Handle SDL event 0x304 by doing nothing (#3670)
|
8 years ago |
Leon Krieg
|
170e723cc7
|
Handle SDL event 0x304 by doing nothing (#3670)
|
8 years ago |
|
scrawl
|
ebfbd88e7d
|
Merge pull request #1166 from OpenMW/revert-1165-sdl_event_0x304_fix
Revert "Handle SDL event 0x304 by doing nothing (#3670)"
|
8 years ago |
|
scrawl
|
63e093bcd0
|
Revert "Handle SDL event 0x304 by doing nothing (#3670)"
|
8 years ago |
|
scrawl
|
21897e493e
|
Merge pull request #1165 from lkrieg/sdl_event_0x304_fix
Handle SDL event 0x304 by doing nothing (#3670)
|
8 years ago |
|
Leon Krieg
|
c2d6e074c2
|
Handle SDL event 0x304 by doing nothing (#3670)
|
8 years ago |
|
scrawl
|
eae35af13d
|
Check if the bounding box changed before calling dirtyBound()
|
8 years ago |
Aussiemon
|
2f66b91ac5
|
Added check to prevent attempted wandering of empty paths
|
8 years ago |
|
scrawl
|
2b2a51d3b2
|
Update AUTHORS.md
|
8 years ago |
|
scrawl
|
913a8fe1bd
|
Merge pull request #1160 from Aussiemon/actorupdatecollision
[Do not merge yet] Added check before attempting to remove actor's collision object
|
8 years ago |
|
scrawl
|
aafff1deb6
|
Fix memory leak
|
8 years ago |
|
Aussiemon
|
b794aa7c2f
|
Helper methods for updateCollisionMask(), prevent water collision being removed twice, remove Bullet 2.8.5 methods
|
8 years ago |
|
scrawl
|
f8690dcd20
|
Set the drag-and-drop state after initiating the drag, not before (Fixes #3134)
|
8 years ago |
|
scrawl
|
cca75499ee
|
Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663)
|
8 years ago |
|
David Cernat
|
2d46b33c5f
|
Removed duplicate team list
|
8 years ago |
|
David Cernat
|
b36415465a
|
Tweaked readme and added first draft of real changelog
|
8 years ago |
|
Stanislav Zhukov
|
f72bea175a
|
Update README.md
|
8 years ago |
|
U-VirtualBox-PC\Admin
|
6229269506
|
Some patches for lua on windows
|
8 years ago |
|
David Cernat
|
35de28e239
|
Fix setting of longer environmental variables on Windows
|
8 years ago |
|
Marc Zinnschlag
|
34389e15cd
|
Merge remote-tracking branch 'origin/master'
|
8 years ago |
|
Marc Zinnschlag
|
827c78a4cd
|
added text column to ref id table (books)
|
8 years ago |
Koncord
|
804259b2c9
|
Change some printf to LOG_MESSAGE_SIMPLE
printf is not streamed to files
|
8 years ago |
|
Koncord
|
2eda48acca
|
Fix issue #111
|
8 years ago |
|
Koncord
|
f74734cfba
|
Fix server crash if player is not fully connected
|
8 years ago |
|
Koncord
|
3ee82a761b
|
Remove redundant include
|
8 years ago |